changeset 20856:306f3c0bccd4

Prevent null pointer deref to fix CID 349. I don't think this is possible, but I suppose it may happen with a different UI.
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 09 Oct 2007 23:39:30 +0000
parents cfaf74ec93dc
children a3be7b2e335c
files libpurple/protocols/msn/msn.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c	Tue Oct 09 23:33:49 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Tue Oct 09 23:39:30 2007 +0000
@@ -943,7 +943,7 @@
 			imdata->msg = body_str;
 			imdata->flags = flags;
 			imdata->when = time(NULL);
-			g_idle_add(msn_send_me_im, imdata);
+			purple_timeout_add(0, msn_send_me_im, imdata);
 		}
 
 		msn_message_destroy(msg);
@@ -1103,7 +1103,7 @@
 	userlist = session->userlist;
 	who = msn_normalize(gc->account, buddy->name);
 
-	purple_debug_info("MSN","Add user:%s to group:%s\n", who, group->name);
+	purple_debug_info("MSN","Add user:%s to group:%s\n", who, (group && group->name) ? group->name : "(null)");
 	if (!session->logged_in)
 	{
 #if 0