kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 55799 via svnmerge from

Browse Source 
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
This commit is contained in:
Jason Parker
2007-02-21 02:04:10 +00:00
parent 7ec331f7ea
commit 8f28800765
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_gtalk.c
View File

@@ -838,7 +838,7 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const
buddy = ASTOBJ_CONTAINER_FIND(&client->connection->buddies, them); buddy = ASTOBJ_CONTAINER_FIND(&client->connection->buddies, them);
if (buddy) if (buddy)
resources = buddy->resources; resources = buddy->resources;
} else } else if (client->buddy)
resources = client->buddy->resources; resources = client->buddy->resources;
while (resources) { while (resources) {
if (resources->cap->jingle) { if (resources->cap->jingle) {

2
channels/chan_jingle.c
View File

@@ -707,7 +707,7 @@ static struct jingle_pvt *jingle_alloc(struct jingle *client, const char *from,
buddy = ASTOBJ_CONTAINER_FIND(&client->connection->buddies, from); buddy = ASTOBJ_CONTAINER_FIND(&client->connection->buddies, from);
if (buddy) if (buddy)
resources = buddy->resources; resources = buddy->resources;
} else } else if (client->buddy)
resources = client->buddy->resources; resources = client->buddy->resources;
while (resources) { while (resources) {
if (resources->cap->jingle) { if (resources->cap->jingle) {