Mercurial > pidgin
changeset 30913:a4f3d21f393c
merge of '69fbc32fd3dfe8ca0979e1c486c3d51eb06088cf'
and 'a3c4035630c492aaae37ec8ddb8943c2f465e166'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 08 Nov 2010 17:05:53 +0000 |
| parents | 6d99f7cdc654 (current diff) 63aeff4ebc19 (diff) |
| children | d9db23719cf9 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Nov 06 03:46:35 2010 +0000 +++ b/ChangeLog Mon Nov 08 17:05:53 2010 +0000 @@ -10,6 +10,9 @@ (http://developer.pidgin.im/wiki/SlpArchitecture) * Lots of little changes. + XMPP: + * Avoid a double-free in the Google Relay (V/V) code. + version 2.7.5 (10/31/2010): General: * Added Verisign Class 3 Public CA - G2 root CA.
--- a/libpurple/protocols/jabber/google/google_session.c Sat Nov 06 03:46:35 2010 +0000 +++ b/libpurple/protocols/jabber/google/google_session.c Mon Nov 08 17:05:53 2010 +0000 @@ -372,7 +372,7 @@ params = jabber_google_session_get_params(js, relay_ip, relay_udp, relay_tcp, relay_ssltcp, relay_username, relay_password, &num_params); - + if (purple_media_add_stream(session_data->media, "google-voice", session->remote_jid, PURPLE_MEDIA_AUDIO, TRUE, "nice", num_params, params) == FALSE || @@ -382,12 +382,11 @@ TRUE, "nice", num_params, params) == FALSE)) { purple_media_error(session_data->media, "Error adding stream."); purple_media_end(session_data->media, NULL, NULL); - g_free(params); } else { session_data->added_streams = TRUE; } - g_free(params); + g_free(params); }