# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1241194190 0
# Node ID 998f471bb801922f2d2d2a501da4f47bea0dccaf
# Parent  0e99b80b54c6baa06ecc6b73cb8af89b0871c9e3# Parent  69d5d6ab4229eb9d18427e5e952f9f1aba716165
merge of '04463c4228e4760066ef026178e08886db366915'
     and '277dbfa504b60a873008deb330ed734a384e33f5'

diff -r 0e99b80b54c6 -r 998f471bb801 COPYRIGHT
--- a/COPYRIGHT	Fri May 01 08:07:12 2009 +0000
+++ b/COPYRIGHT	Fri May 01 16:09:50 2009 +0000
@@ -30,6 +30,7 @@
 Derek Battams
 Martin Bayard
 Curtis Beattie
+Stefan Becker
 Carlos Bederian
 Dave Bell
 Igor Belyi
diff -r 0e99b80b54c6 -r 998f471bb801 libpurple/mime.c
--- a/libpurple/mime.c	Fri May 01 08:07:12 2009 +0000
+++ b/libpurple/mime.c	Fri May 01 16:09:50 2009 +0000
@@ -110,7 +110,7 @@
 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 */
@@ -126,17 +126,18 @@
 
 	/* 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);
 }
@@ -436,6 +437,8 @@
 
 		b = tail;
 	}
+
+	g_free(bnd);
 }