During hangup it is possible for p->chan or p->owner to be NULL, so just return what the channel is bridged to instead of what they are *really* bridged to. Thanks Matt Nicholson!

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Joshua Colp 18 years ago
parent 9ddc843fbe
commit 6fad8249f5

@ -183,9 +183,12 @@ static struct ast_channel *local_bridgedchannel(struct ast_channel *chan, struct
bridged = (bridge == p->owner ? p->chan : p->owner);
/* Now see if the opposite channel is bridged to anything */
if (bridged->_bridge)
if (!bridged) {
bridged = bridge;
} else if (bridged->_bridge) {
bridged = bridged->_bridge;
}
}
ast_mutex_unlock(&p->lock);

Loading…
Cancel
Save