From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 4 Jun 2007 15:53:15 +0000 (+0000)
Subject: Merged revisions 67021 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4538cec96a15a72444d9c8857e0b7bfe28959357;p=thirdparty%2Fasterisk.git

Merged revisions 67021 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67021 | tilghman | 2007-06-04 10:50:16 -0500 (Mon, 04 Jun 2007) | 2 lines

Issue 9739 - Malformed jid causes a crash

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_jabber.c b/res/res_jabber.c
index 79731dc917..5b88bf7417 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -546,6 +546,10 @@ static int aji_act_hook(void *data, int type, iks *node)
 								}
 							}
 						} else {
+							if (!client->jid->user) {
+								ast_log(LOG_ERROR, "Malformed Jabber ID : %s (domain missing?)\n", client->jid->full);
+								break;
+							}
 							features = aji_highest_bit(features);
 							if (features == IKS_STREAM_SASL_MD5)
 								iks_start_sasl(client->p, IKS_SASL_DIGEST_MD5, client->jid->user, client->password);