From 8f28800765bf15afce085a96dc75974e2bbceddb Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Wed, 21 Feb 2007 02:04:10 +0000
Subject: [PATCH] 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
---
 channels/chan_gtalk.c  | 2 +-
 channels/chan_jingle.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index ad335d2f96..76e1399de8 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -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) {
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 26980640b2..50f11538da 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) {