[asterisk-commits] tilghman: trunk r67023 - in /trunk: ./ res/res_jabber.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Mon Jun  4 10:53:15 2007
New Revision: 67023

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67023
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/res/res_jabber.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_jabber.c?view=diff&rev=67023&r1=67022&r2=67023
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Mon Jun  4 10:53:15 2007
@@ -546,6 +546,10 @@
 								}
 							}
 						} 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);