From: <ev...@us...> - 2006-12-10 14:47:26
|
Revision: 17947 http://svn.sourceforge.net/gaim/?rev=17947&view=rev Author: evands Date: 2006-12-10 06:45:27 -0800 (Sun, 10 Dec 2006) Log Message: ----------- If a message is being received in a group chat at a moment just after it has been left, gaim_conv_chat_incoming_msg() is still triggerred but find_oscar_chat_by_conn() returns NULL. We no longer crash in this situation. Modified Paths: -------------- trunk/libgaim/protocols/oscar/oscar.c Modified: trunk/libgaim/protocols/oscar/oscar.c =================================================================== --- trunk/libgaim/protocols/oscar/oscar.c 2006-12-10 11:26:17 UTC (rev 17946) +++ trunk/libgaim/protocols/oscar/oscar.c 2006-12-10 14:45:27 UTC (rev 17947) @@ -3078,6 +3078,9 @@ GaimConnection *gc = od->gc; struct chat_connection *ccon = find_oscar_chat_by_conn(gc, conn); + if (!ccon) + return 1; + va_start(ap, fr); roominfo = va_arg(ap, struct aim_chat_roominfo *); roomname = va_arg(ap, char *); @@ -3112,6 +3115,9 @@ char *msg; char *charset; + if (!ccon) + return 1; + va_start(ap, fr); info = va_arg(ap, aim_userinfo_t *); len = va_arg(ap, int); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |