From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 23 Oct 2006 17:08:53 +0000 (+0000)
Subject: Merged revisions 45999 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a58d83cc0057fb72b8c7bdd83e0ad97bbed1dce;p=thirdparty%2Fasterisk.git

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)

........


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

diff --git a/res/res_jabber.c b/res/res_jabber.c
index 250a988a60..0a7f5fb924 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -1099,7 +1099,8 @@ static void aji_handle_message(struct aji_client *client, ikspak *pak)
 		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) {