summaryrefslogtreecommitdiff
path: root/channels/chan_jingle.c
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2007-02-21 02:04:10 +0000
committerJason Parker <jparker@digium.com>2007-02-21 02:04:10 +0000
commit8f28800765bf15afce085a96dc75974e2bbceddb (patch)
tree2eaa38e6eff49b35e1feb65e6ab3dae38679c8b1 /channels/chan_jingle.c
parent7ec331f7ea87124c81fa86752b8e657dadb6ca5f (diff)
Merged revisions 55799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r55799 | qwell | 2007-02-20 20:01:36 -0600 (Tue, 20 Feb 2007) | 4 lines Fix segfault when buddy couldn't be found. Issue 7764, patch by sailer ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_jingle.c')
-rw-r--r--channels/chan_jingle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 26980640b..50f11538d 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -707,7 +707,7 @@ static struct jingle_pvt *jingle_alloc(struct jingle *client, const char *from,
buddy = ASTOBJ_CONTAINER_FIND(&client->connection->buddies, from);
if (buddy)
resources = buddy->resources;
- } else
+ } else if (client->buddy)
resources = client->buddy->resources;
while (resources) {
if (resources->cap->jingle) {