aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2016-08-24 10:08:02 +0200
committerMarius Halden <marius.h@lden.org>2016-08-24 10:08:02 +0200
commit942e1d8011536f60a4d2dccf89e4b0e7e25f0602 (patch)
tree52a997023e8f57d5c4638371fa37799f7b9b2810 /protocols
parentd1d180e29cf73eda249c8ce0b81fed940ee83130 (diff)
parent2dc394c7b0d7dfec1e0a7f553d3510c5efa98086 (diff)
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols')
-rw-r--r--protocols/jabber/jabber_util.c4
1 files changed, 4 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] == '/')) {