pidgin: 3d06a17d: Sigh, so apparently, I broke receiving s...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 3d06a17dd5bf8095f142141e395986dda870cfe6
Parent:   572380531f1918ab47ff6a6dcca804bd8be42adf
Author:   qulogic at pidgin.im
Date:     11/21/10 22:01:14
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3d06a17dd5bf8095f142141e395986dda870cfe6

Changelog: 

Sigh, so apparently, I broke receiving smileys with some over-zealous
free-ing of slpmsgs. Remind me not to work at 4AM again.

Changes against parent 572380531f1918ab47ff6a6dcca804bd8be42adf

  patched  libpurple/protocols/msn/slplink.c

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slplink.c	b7a13d7e3ff94d2e98bc033168f4a7d126920932
+++ libpurple/protocols/msn/slplink.c	3c215c846803cab473e23a5b8956fd86611fb496
@@ -502,6 +502,7 @@ process_complete_msg(MsnSlpLink *slplink
 	slpcall = msn_slp_process_msg(slplink, slpmsg);
 
 	if (slpcall == NULL) {
+		msn_slpmsg_destroy(slpmsg);
 		return;
 	}
 
@@ -540,6 +541,8 @@ process_complete_msg(MsnSlpLink *slplink
 		}
 	}
 
+	msn_slpmsg_destroy(slpmsg);
+
 	if (!slpcall->wait_for_socket && slpcall->wasted)
 		msn_slpcall_destroy(slpcall);
 }
@@ -623,7 +626,9 @@ msn_slplink_process_msg(MsnSlpLink *slpl
 	if (header->offset + header->length >= header->total_size)
 		process_complete_msg(slplink, slpmsg, header);
 
-	msn_slpmsg_destroy(slpmsg);
+	/* NOTE: The slpmsg will be destroyed in process_complete_msg or left in
+	   the slplink until fully received. Don't free it here!
+	 */
 }
 
 void