Changeset 4543b6bd

Timestamp:

2015-04-04T01:23:59Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

71abe93

Parents:

3dcc878

Message:

jabber: Fixed null deref when receiving <subject> from oneself

If the from="..." of the message that includes a subject refers to us,
that buddy object won't have an ext_jid set, and passing that to
strchr() results in pain.

This happens with recent versions of an xmpp server called "lets-chat".

File:

• protocols/jabber/conference.c (modified) (2 diffs)

protocols/jabber/conference.c

@@ -359 +359 @@
 
         if (subject && chat) {
-                s = bud ? strchr(bud->ext_jid, '/') : NULL;
+                s = (bud && bud->ext_jid) ? strchr(bud->ext_jid, '/') : NULL;
                 if (s) {
                         *s = 0;
@@ -419 +419 @@
         }
         if (body && body->text_len > 0) {
-                s = strchr(bud->ext_jid, '/');
+                s = (bud->ext_jid) ? strchr(bud->ext_jid, '/') : NULL;
                 if (s) {
                         *s = 0;