pidgin.2.5.6: 05325ad0: applied changes from 8567515a55af9b920b1...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 05325ad06b473a5932ac8cecbf0f96297eb86246
Ancestor: 8fb5ae1ceb3a8602d59384feb4ca06acbe366e76
Author: nosnilmot at pidgin.im
Date: 2009-05-01T16:05:55
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/05325ad06b473a5932ac8cecbf0f96297eb86246

Modified files:
        COPYRIGHT libpurple/mime.c

ChangeLog: 

applied changes from 8567515a55af9b920b1ff380fe95c5f9c138f4ec
             through 277dbfa504b60a873008deb330ed734a384e33f5
Patch from Stefan Becker to plug a couple of memory leaks in libpurple/mime.c
References #9088

-------------- next part --------------
============================================================
--- COPYRIGHT	606a4dbde913230da608b3b8b61607f7759b0f98
+++ COPYRIGHT	17e91672a8b2aec69ee57fb9c8acaaa63ad4a5b9
@@ -30,6 +30,7 @@ Curtis Beattie
 Derek Battams
 Martin Bayard
 Curtis Beattie
+Stefan Becker
 Dave Bell
 Igor Belyi
 Brian Bernas
============================================================
--- libpurple/mime.c	80943e7f831871a988feadb329f9652308788031
+++ libpurple/mime.c	438c5351740588d39e4d8a75ac3a9ce2ed71f3fd
@@ -113,7 +113,7 @@ fields_loadline(struct mime_fields *mf, 
 fields_loadline(struct mime_fields *mf, const char *line, gsize len)
 {
 	/* split the line into key: value */
-	char *key, *val;
+	char *key, *newkey, *val;
 	char **tokens;
 
 	/* feh, need it to be NUL terminated */
@@ -129,17 +129,18 @@ fields_loadline(struct mime_fields *mf, 
 
 	/* normalize whitespace (sorta) and trim on key and value */
 	tokens = g_strsplit(key, "\t\r\n", 0);
-	key = g_strjoinv("", tokens);
-	key = g_strstrip(key);
+	newkey = g_strjoinv("", tokens);
+	g_strstrip(newkey);
 	g_strfreev(tokens);
 
 	tokens = g_strsplit(val, "\t\r\n", 0);
 	val = g_strjoinv("", tokens);
-	val = g_strstrip(val);
+	g_strstrip(val);
 	g_strfreev(tokens);
 
-	fields_set(mf, key, val);
+	fields_set(mf, newkey, val);
 
+	g_free(newkey);
 	g_free(key);
 	g_free(val);
 }
@@ -439,6 +440,8 @@ doc_parts_load(PurpleMimeDocument *doc, 
 
 		b = tail;
 	}
+
+	g_free(bnd);
 }