libpurple/protocols/jabber/message.c

changeset 29910
f1c6e586e5c1
parent 29906
2403e9d40e4a
child 29912
4f8e1c3bbc4a
child 29913
58f5122fbcd3
child 30119
42251a0a3bbd
--- a/libpurple/protocols/jabber/message.c	Mon Mar 22 20:15:55 2010 +0000
+++ b/libpurple/protocols/jabber/message.c	Mon Mar 22 21:34:17 2010 +0000
@@ -474,7 +474,10 @@
 		if (!data && cid != NULL) {
 			/* we haven't cached this already, let's add it */
 			JabberData *new_data = jabber_data_create_from_xml(data_tag);
-			jabber_data_associate_remote(new_data);
+
+			if (new_data) {
+				jabber_data_associate_remote(new_data);
+			}
 		}
 	}
 }

mercurial