Merged revisions 55799 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 21 Feb 2007 02:04:10 +0000 (02:04 +0000)
committerJason Parker <jparker@digium.com>
Wed, 21 Feb 2007 02:04:10 +0000 (02:04 +0000)
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

channels/chan_gtalk.c
channels/chan_jingle.c

index ad335d2..76e1399 100644 (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);
                        if (buddy)
                                resources = buddy->resources;
-               } else 
+               } else if (client->buddy)
                        resources = client->buddy->resources;
                while (resources) {
                        if (resources->cap->jingle) {
index 2698064..50f1153 100644 (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);
                        if (buddy)
                                resources = buddy->resources;
-               } else 
+               } else if (client->buddy)
                        resources = client->buddy->resources;
                while (resources) {
                        if (resources->cap->jingle) {