[asterisk-commits] qwell: trunk r76621 - in /trunk: ./ channels/chan_skinny.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Jul 23 12:58:46 2007
New Revision: 76621

URL: http://svn.digium.com/view/asterisk?view=rev&rev=76621
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=76621&r1=76620&r2=76621
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Mon Jul 23 12:58:46 2007
@@ -3065,6 +3065,10 @@
 	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);
@@ -3104,6 +3108,10 @@
 	struct skinny_device *d = l->parent;
 	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)