diff options
| author | Marius Halden <marius.h@lden.org> | 2016-08-24 10:08:02 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-08-24 10:08:02 +0200 |
| commit | 942e1d8011536f60a4d2dccf89e4b0e7e25f0602 (patch) | |
| tree | 52a997023e8f57d5c4638371fa37799f7b9b2810 | |
| parent | d1d180e29cf73eda249c8ce0b81fed940ee83130 (diff) | |
| parent | 2dc394c7b0d7dfec1e0a7f553d3510c5efa98086 (diff) | |
Merge branch 'master' into patched-master
| -rw-r--r-- | protocols/jabber/jabber_util.c | 4 | ||||
| -rw-r--r-- | tests/check_jabber_util.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c index c3c9df34..ee4753f2 100644 --- a/protocols/jabber/jabber_util.c +++ b/protocols/jabber/jabber_util.c @@ -314,6 +314,10 @@ int jabber_compare_jid(const char *jid1, const char *jid2) { int i; + if (!jid1 || !jid2) { + return FALSE; + } + for (i = 0;; i++) { if (jid1[i] == '\0' || jid1[i] == '/' || jid2[i] == '\0' || jid2[i] == '/') { if ((jid1[i] == '\0' || jid1[i] == '/') && (jid2[i] == '\0' || jid2[i] == '/')) { diff --git a/tests/check_jabber_util.c b/tests/check_jabber_util.c index 1ffea011..43180fce 100644 --- a/tests/check_jabber_util.c +++ b/tests/check_jabber_util.c @@ -102,6 +102,8 @@ static void check_compareJID(int l) fail_if(jabber_compare_jid("bugtest1@google.com/B", "bugtest2@google.com/A")); 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)); } static void check_hipchat_slug(int l) |