Merged revisions 76620 via svnmerge from
authorJason Parker <jparker@digium.com>
Mon, 23 Jul 2007 17:58:46 +0000 (17:58 +0000)
committerJason Parker <jparker@digium.com>
Mon, 23 Jul 2007 17:58:46 +0000 (17:58 +0000)
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

channels/chan_skinny.c

index 2416292..cba099c 100644 (file)
@@ -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);