Changeset 2dc394c

Timestamp:

2016-08-24T00:02:20Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

67ea361

Parents:

88cde4e

Message:

jabber: handle nulls in jabber_compare_jid

As far as I can see this isn't remotely exploitable (and if it were it
would be just DoS of the child process), but i'm still looking into it

Files:

• protocols/jabber/jabber_util.c (modified) (1 diff)
• tests/check_jabber_util.c (modified) (1 diff)

protocols/jabber/jabber_util.c

@@ -315 +315 @@
         int i;
 
+        if (!jid1 || !jid2) {
+                return FALSE;
+        }
+
         for (i = 0;; i++) {
                 if (jid1[i] == '\0' || jid1[i] == '/' || jid2[i] == '\0' || jid2[i] == '/') {

tests/check_jabber_util.c

@@ -103 +103 @@
         fail_unless(jabber_compare_jid("bugtest@google.com/A", "bugtest@google.com/A"));
         fail_if(jabber_compare_jid("", "bugtest@google.com/A"));
+        fail_if(jabber_compare_jid(NULL, ""));
+        fail_if(jabber_compare_jid("", NULL));
 }