diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-23 17:08:53 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-23 17:08:53 +0000 |
| commit | 651b63cab6365d12165ff61cf0e06e5766ffe7d8 (patch) | |
| tree | 3537b8aa2e4c97c694a1b640ee81b45b618834f7 /res/res_jabber.c | |
| parent | 2c178adeff873d3cc5cde1d404c0a3199b8058b8 (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: http://svn.digium.com/svn/asterisk/trunk@46000 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_jabber.c')
| -rw-r--r-- | res/res_jabber.c | 3 |
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) { |