summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2006-10-23 17:08:53 +0000
committerRussell Bryant <russell@russellbryant.com>2006-10-23 17:08:53 +0000
commit6a58d83cc0057fb72b8c7bdd83e0ad97bbed1dce (patch)
tree3537b8aa2e4c97c694a1b640ee81b45b618834f7 /res
parent9bbf557dfb73e11de37b2e4ec960c49cb5dabd0b (diff)
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
Diffstat (limited to 'res')
-rw-r--r--res/res_jabber.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 250a988a6..0a7f5fb92 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) {