diff options
author | David Vossel <dvossel@digium.com> | 2011-05-03 21:45:46 +0000 |
---|---|---|
committer | David Vossel <dvossel@digium.com> | 2011-05-03 21:45:46 +0000 |
commit | bb5e875b6504d955e56693f2d1c538a304379383 (patch) | |
tree | e18ef8c5e964a50d0220c42dea2c46c85e85e2ab /channels | |
parent | 37aa52fd78996b5c516ff4c851b60252eda84b05 (diff) |
Merged revisions 316330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r316330 | dvossel | 2011-05-03 16:37:59 -0500 (Tue, 03 May 2011) | 24 lines
Merged revisions 316329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r316329 | dvossel | 2011-05-03 16:29:55 -0500 (Tue, 03 May 2011) | 17 lines
Merged revisions 316328 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r316328 | dvossel | 2011-05-03 16:27:59 -0500 (Tue, 03 May 2011) | 10 lines
Fixes chan_local crashs in local_fixup()
Thanks OEJ for tracking down the issue and submitting the patch.
(closes issue #19053)
Reported by: oej
Tested by: oej
Review: https://reviewboard.asterisk.org/r/1158/
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_local.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index f590bf33a..bf5e6b126 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -562,7 +562,7 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) p->chan = newchan; /* Do not let a masquerade cause a Local channel to be bridged to itself! */ - if (!ast_check_hangup(newchan) && (p->owner->_bridge == p->chan || p->chan->_bridge == p->owner)) { + if (!ast_check_hangup(newchan) && ((p->owner && p->owner->_bridge == p->chan) || (p->chan && p->chan->_bridge == p->owner))) { ast_log(LOG_WARNING, "You can not bridge a Local channel to itself!\n"); ao2_unlock(p); ast_queue_hangup(newchan); |