From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 19 Jun 2007 19:15:03 +0000 (+0000)
Subject: Merged revisions 70084 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3957ce9215c828fed59982dea52a7f12ad5f9faa;p=thirdparty%2Fasterisk.git

Merged revisions 70084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r70084 | russell | 2007-06-19 14:13:45 -0500 (Tue, 19 Jun 2007) | 3 lines

Only attempt to queue a hangup on the owner channel if it actually exists.
(issue #9795, patch from zandbelt)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 537bc00a07..abd6d9d8c0 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -690,10 +690,10 @@ static int gtalk_hangup_farend(struct gtalk *client, ikspak *pak)
 	if(!from)
 		from = client->connection->jid->full;
 
-
 	if (tmp) {
 		tmp->alreadygone = 1;
-		ast_queue_hangup(tmp->owner);
+		if (tmp->owner)
+			ast_queue_hangup(tmp->owner);
 	} else
 		ast_log(LOG_NOTICE, "Whoa, didn't find call!\n");
 	gtalk_response(client, from, pak, NULL, NULL);
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 3035f8c5b4..3790673204 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -571,7 +571,8 @@ static int jingle_hangup_farend(struct jingle *client, ikspak *pak)
 
 	if (tmp) {
 		tmp->alreadygone = 1;
-		ast_queue_hangup(tmp->owner);
+		if (tmp->owner)
+			ast_queue_hangup(tmp->owner);
 	} else
 		ast_log(LOG_NOTICE, "Whoa, didn't find call!\n");
 	jingle_response(client, pak, NULL, NULL);