pidgin: 1f238910: Fix a null ptr deref/double free. Fixes..

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 1f2389102710408d72b6c0f52a59d9b514c38b89
Ancestor: 3da4a61feea56ff40dc5fdba355a1057c675a32d
Author: datallah at pidgin.im
Date: 2009-02-06T03:50:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1f2389102710408d72b6c0f52a59d9b514c38b89

Modified files:
        libpurple/upnp.c

ChangeLog: 

Fix a null ptr deref/double free.  Fixes #8336.

-------------- next part --------------
============================================================
--- libpurple/upnp.c	7f99eb010eb284e1d53b9fc2b0e96b3f5164dca2
+++ libpurple/upnp.c	9e67838c069b3a9b72f46752416bba3ae5a38169
@@ -567,7 +567,7 @@ purple_upnp_discover_send_broadcast(UPnP
 purple_upnp_discover_send_broadcast(UPnPDiscoveryData *dd)
 {
 	gchar *sendMessage = NULL;
-	gsize totalSize;
+	size_t totalSize;
 	gboolean sentSuccess;
 
 	/* because we are sending over UDP, if there is a failure
@@ -693,6 +693,7 @@ purple_upnp_generate_action_message_and_
 		/* XXX: This should probably be async */
 		if(cb)
 			cb(NULL, cb_data, NULL, 0, NULL);
+		return NULL;
 	}
 	if(port == 0 || port == -1) {
 		port = DEFAULT_HTTP_PORT;
@@ -711,11 +712,11 @@ purple_upnp_generate_action_message_and_
 	g_free(soapMessage);
 
 	gfud = purple_util_fetch_url_request_len(control_info.control_url, FALSE, NULL, TRUE,
-				totalSendMessage,  TRUE, MAX_UPNP_DOWNLOAD, cb, cb_data);
+				totalSendMessage, TRUE, MAX_UPNP_DOWNLOAD, cb, cb_data);
 
 	g_free(totalSendMessage);
 	g_free(addressOfControl);
-	
+
 	return gfud;
 }