pidgin: ca8febcd: jabber: Fix a crash in the BoB code when...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: ca8febcd75d5d72dae81ba4d2c0b30c1620853c9
Ancestor: 26acfe7eacc1bdb290a00149b828ed102e023284
Author: darkrain42 at pidgin.im
Date: 2010-06-17T01:51:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ca8febcd75d5d72dae81ba4d2c0b30c1620853c9

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

ChangeLog: 

jabber: Fix a crash in the BoB code when receiving from Jabbim.

Actually, the real problem here is that Jabbim is leaving off a REQUIRED
attribute (see http://xmpp.org/extensions/xep-0231.html#format), but
we still shouldn't crash :).  Closes #12185

-------------- next part --------------
============================================================
--- ChangeLog	028fe3743148f69496e4bd22dad8c6a8864e4763
+++ ChangeLog	a6bb4ec247905ed0e6a2d9118bb9c6d3d9646a27
@@ -16,6 +16,8 @@ version 2.7.2 (??/??/????):
 	XMPP:
 	* Allow connecting to servers that only advertise GSSAPI and expect
 	  a fallback to legacy IQ authentication (broken in 2.7.0).
+	* Fix a crash when receiving custom emoticons that don't adhere to
+	  the specification.
 
 	Yahoo/Yahoo JAPAN:
 	* Renamed "Use account proxy for SSL connections" to "Use account proxy
============================================================
--- libpurple/protocols/jabber/data.c	668dd94891f8de9d3f3e835459909a4e8e89c7bc
+++ libpurple/protocols/jabber/data.c	e964bbee9f5c902eaed77496f915daa1b8f4f611
@@ -291,7 +291,7 @@ jabber_data_request_cb(JabberStream *js,
 	if (data_element && type == JABBER_IQ_RESULT) {
 		JabberData *data = jabber_data_create_from_xml(data_element);
 
-		if (!ephemeral) {
+		if (data && !ephemeral) {
 			jabber_data_associate_remote(js, from, data);
 		}
 		cb(data, alt, userdata);