[svn-commits] russell: trunk r46000 - in /trunk: ./ res/res_jabber.c

[svn-commits at lists.digium.com]

Author: russell
Date: Mon Oct 23 12:08:53 2006
New Revision: 46000

URL: http://svn.digium.com/view/asterisk?rev=46000&view=rev
Log:
Merged revisions 45999 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45999 | russell | 2006-10-23 13:07:45 -0400 (Mon, 23 Oct 2006) | 2 lines

don't crash when an incoming message has no "from" (issue #8205, jmls)

........

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?rev=46000&r1=45999&r2=46000&view=diff
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Mon Oct 23 12:08:53 2006
@@ -1099,7 +1099,8 @@
 		insert->message = ast_strdup(iks_find_cdata(pak->x, "body"));
 	if(pak->id)
 		ast_copy_string(insert->id, pak->id, sizeof(insert->message));
-	insert->from = ast_strdup(pak->from->full);
+	if (pak->from)
+		insert->from = ast_strdup(pak->from->full);
 	AST_LIST_LOCK(&client->messages);
 	AST_LIST_TRAVERSE_SAFE_BEGIN(&client->messages, tmp, list) {
 		if (flag) {