Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jabber.c	Sat May 31 20:15:34 2008 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon Jun 02 18:18:58 2008 +0000
@@ -2646,8 +2646,15 @@
                              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;