pidgin.2.6.5: 4b35328d: *** Plucked rev f39cd1fed08fe5f5e3165a08...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 4b35328db9640a071b54ef4454887d390ac52c4f
Ancestor: b43a854a64a45ed46cd39c74101fc51542c091d6
Author: datallah at pidgin.im
Date: 2010-01-07T23:44:05
Branch: im.pidgin.pidgin.2.6.5
URL: http://d.pidgin.im/viewmtn/revision/info/4b35328db9640a071b54ef4454887d390ac52c4f

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

ChangeLog: 

*** Plucked rev f39cd1fed08fe5f5e3165a087fcc36ed984a6eee (f05c54b03e6bbfdbff38c01697fbd353a969e05e):
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	945f8394b2dddf8973f4ff2f482137c23d5881ce
+++ libpurple/protocols/oscar/oscar.c	23542ec35a0faf483f385eba530af2e5214f4408
@@ -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;