diff options
| author | Jason Parker <jparker@digium.com> | 2007-07-23 17:58:46 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2007-07-23 17:58:46 +0000 |
| commit | 6f81f606966b7b3fc1623824f461da0ac7d15e05 (patch) | |
| tree | 48880d1557b693187d96b0ffae0917598269441d /channels/chan_skinny.c | |
| parent | 32237bb1baed535277059466a8140d758526c7de (diff) | |
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
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 241629200..cba099c63 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); |