From: Jason Parker <jparker@digium.com>
Date: Mon, 23 Jul 2007 17:58:46 +0000 (+0000)
Subject: Merged revisions 76620 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1950
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f81f606966b7b3fc1623824f461da0ac7d15e05;p=thirdparty%2Fasterisk.git

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

(closes issue #10276)
........
r76620 | qwell | 2007-07-23 12:57:53 -0500 (Mon, 23 Jul 2007) | 4 lines

Don't try to queue up hold/unhold frames on a non-existent channel.

Issue 10276.

........


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

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 2416292002..cba099c639 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -3065,6 +3065,10 @@ static int skinny_hold(struct skinny_subchannel *sub)
 	struct skinnysession *s = d->session;
 	struct skinny_req *req;
 
+	/* Don't try to hold a channel that doesn't exist */
+	if (!sub || !sub->owner)
+		return 0;
+
 	/* Channel needs to be put on hold */
 	if (skinnydebug)
 		ast_verbose("Putting on Hold(%d)\n", l->instance);
@@ -3105,6 +3109,10 @@ static int skinny_unhold(struct skinny_subchannel *sub)
 	struct skinnysession *s = d->session;
 	struct skinny_req *req;
 
+	/* Don't try to unhold a channel that doesn't exist */
+	if (!sub || !sub->owner)
+		return 0;
+
 	/* Channel is on hold, so we will unhold */
 	if (skinnydebug)
 		ast_verbose("Taking off Hold(%d)\n", l->instance);