pidgin: f39cd1fe: oscar: Avoid a printf("%s", NULL) crash ...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Tue Dec 8 12:26:14 EST 2009


-----------------------------------------------------------------
Revision: f39cd1fed08fe5f5e3165a087fcc36ed984a6eee
Ancestor: 6a5f94151ae9c9afbba73e905edb55cd64f6b3ea
Author: darkrain42 at pidgin.im
Date: 2009-12-08T17:23:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f39cd1fed08fe5f5e3165a087fcc36ed984a6eee

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

oscar: Avoid a printf("%s", NULL) crash when creating an AIM room.

Both of these strings appear to be optional in parseinfo_create(), so we
can't rely on their being non-NULL.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	10ac97618f2ffe8ad49ebcc603521f7881a1fe27
+++ libpurple/protocols/oscar/oscar.c	1eb7bc47c9b57720b583c8db4bf2222046efe5a4
@@ -3576,9 +3576,9 @@ static int purple_chatnav_info(OscarData
 
 			purple_debug_misc("oscar",
 					"created room: %s %hu %hu %hu %u %hu %hu %hhu %hu %s %s\n",
-					fqcn, exchange, instance, flags, createtime,
+					fqcn ? fqcn : "(null)", exchange, instance, flags, createtime,
 					maxmsglen, maxoccupancy, createperms, unknown,
-					name, ck);
+					name ? name : "(null)", ck);
 			aim_chat_join(od, exchange, ck, instance);
 			}
 			break;


More information about the Commits mailing list