[asterisk-commits] file: trunk r382924 - in /trunk: ./ res/res_xmpp.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Mar 12 15:07:10 2013
New Revision: 382924

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382924
Log:
Fix a crash when res_xmpp is configured using a username without a domain.

(closes issue ASTERISK-21156)
Reported by: amsoft2001
........

Merged revisions 382923 from http://svn.asterisk.org/svn/asterisk/branches/11

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

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

Modified: trunk/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_xmpp.c?view=diff&rev=382924&r1=382923&r2=382924
==============================================================================
--- trunk/res/res_xmpp.c (original)
+++ trunk/res/res_xmpp.c Tue Mar 12 15:07:10 2013
@@ -3772,8 +3772,8 @@
 			cfg->client->jid = iks_id_new(cfg->client->stack, cfg->user);
 		}
 
-		if (!cfg->client->jid) {
-			ast_log(LOG_ERROR, "Jabber identity could not be created for client '%s' - client not active\n", cfg->name);
+		if (!cfg->client->jid || ast_strlen_zero(cfg->client->jid->user)) {
+			ast_log(LOG_ERROR, "Jabber identity '%s' could not be created for client '%s' - client not active\n", cfg->user, cfg->name);
 			return -1;
 		}