pidgin: a3c40356: jabber: Avoid a double-free in the googl...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: a3c4035630c492aaae37ec8ddb8943c2f465e166
Parent:   ace5096d9a636c72dad388ae52beeec3651bd8f9
Author:   darkrain42 at pidgin.im
Date:     11/08/10 12:05:18
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a3c4035630c492aaae37ec8ddb8943c2f465e166

Changelog: 

jabber: Avoid a double-free in the google relay code.

Also some whitespace clean-up right next to the double-free.  Reported by
"mordy" in #pidgin.

Changes against parent ace5096d9a636c72dad388ae52beeec3651bd8f9

  patched  ChangeLog
  patched  libpurple/protocols/jabber/google/google_session.c

-------------- next part --------------
============================================================
--- ChangeLog	fa04d4508acee126cffe35e0fee14cdddc21e29e
+++ ChangeLog	29bcc9ea108285388ff08df41abf4e71f5d1224e
@@ -10,6 +10,9 @@ version 2.7.6 (??/??/????):
 	  (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.
============================================================
--- libpurple/protocols/jabber/google/google_session.c	ce400a6cadef87549c47a82bdbbd9d3b6ee3d184
+++ libpurple/protocols/jabber/google/google_session.c	e5040d7269213d2586e6bb19b62fdee7d577ca8a
@@ -372,7 +372,7 @@ jabber_google_relay_response_session_ini
 	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 @@ jabber_google_relay_response_session_ini
 			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);
 }