soc.2008.vv: 0e3d104c: Fix crash bug when checking if a contact...

maiku at soc.pidgin.im maiku at soc.pidgin.im
Mon Jun 2 14:25:46 EDT 2008


-----------------------------------------------------------------
Revision: 0e3d104cc0b327bc26b945dee862a84caca15e65
Ancestor: 8c2c4614b3fb8864734e22baba48a3028dacbe35
Author: maiku at soc.pidgin.im
Date: 2008-06-02T18:18:58
Branch: im.pidgin.soc.2008.vv
URL: http://d.pidgin.im/viewmtn/revision/info/0e3d104cc0b327bc26b945dee862a84caca15e65

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

ChangeLog: 

Fix crash bug when checking if a contact can do media when logging out.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	4939e88d407ede4d01d3d11f6a28c9f43ec5690c
+++ libpurple/protocols/jabber/jabber.c	922014ad3970f8eddeea38b52e6a2e7785a3d913
@@ -2646,8 +2646,15 @@ gboolean jabber_can_do_media(PurpleConne
                              PurpleMediaStreamType type)
 {
 	JabberStream *js = (JabberStream *) gc->proto_data;
-	JabberBuddy *jb = jabber_buddy_find(js, who, FALSE);
-	
+	JabberBuddy *jb;
+
+	if (!js) {
+		purple_debug_error("jabber", "jabber_can_do_media: NULL stream\n");
+		return FALSE;
+	}
+
+	jb = jabber_buddy_find(js, who, FALSE);
+
 	if (!jb) {
 		purple_debug_error("jabber", "Could not find buddy\n");
 		return FALSE;


More information about the Commits mailing list