[Gaim-commits] CVS: gaim/src/protocols/msn msg.c,1.28,1.29

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1:/tmp/cvs-serv407

Modified Files:
	msg.c 
Log Message:
Now we protect ourselves better when someone pastes binary content into a
conversation.


Index: msg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msg.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -p -r1.28 -r1.29
--- msg.c	13 Dec 2003 06:13:51 -0000	1.28
+++ msg.c	13 Dec 2003 06:19:56 -0000	1.29
@@ -309,7 +309,21 @@ msn_message_new_from_str(MsnSession *ses
 	}
 	else
 	{
-		msn_message_set_body(msg, tmp);
+		char *tmp2;
+		size_t body_len;
+
+		body_len = msg->size - (tmp - tmp_base);
+
+		tmp2 = g_malloc(body_len + 1);
+
+		if (body_len > 0)
+			memcpy(tmp2, tmp, body_len);
+
+		tmp2[body_len] = '\0';
+
+		msn_message_set_body(msg, tmp2);
+
+		g_free(tmp2);
 	}
 
 	g_free(command_header);