Mercurial > pidgin.yaz
changeset 30626:fcc36743697c
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
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 17 Jun 2010 01:51:58 +0000 |
| parents | 24ed54cf50b9 |
| children | 7227c51730b0 |
| files | ChangeLog libpurple/protocols/jabber/data.c |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 17 01:45:44 2010 +0000 +++ b/ChangeLog Thu Jun 17 01:51:58 2010 +0000 @@ -16,6 +16,8 @@ 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
--- a/libpurple/protocols/jabber/data.c Thu Jun 17 01:45:44 2010 +0000 +++ b/libpurple/protocols/jabber/data.c Thu Jun 17 01:51:58 2010 +0000 @@ -291,7 +291,7 @@ 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);