kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock potential with ast_set_hangupsource() calls.

Browse Source 
Calling ast_set_hangupsource() with the channel lock held can result in a
deadlock because the function also locks the bridged channel.

(issue ASTERISK-19537)

(closes issue AST-891)
Reported by: Guenther Kelleter
Tested by: Guenther Kelleter

(closes issue ASTERISK-19801)
Reported by: Alec Davis
........

Merged revisions 368759 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 368760 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-06-11 17:34:08 +00:00
parent c6142cf2cc
commit 72eb8eb1e7
6 changed files with 83 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/channel.c
View File

@@ -2566,12 +2566,18 @@ void ast_set_hangupsource(struct ast_channel *chan, const char *source, int forc
ast_channel_hangupsource_set(chan, source);
}
bridge = ast_bridged_channel(chan);
if (bridge) {
ast_channel_ref(bridge);
}
ast_channel_unlock(chan);
if (bridge && (force || ast_strlen_zero(ast_channel_hangupsource(bridge)))) {
if (bridge) {
ast_channel_lock(bridge);
ast_channel_hangupsource_set(chan, source);
if (force || ast_strlen_zero(ast_channel_hangupsource(bridge))) {
ast_channel_hangupsource_set(bridge, source);
}
ast_channel_unlock(bridge);
ast_channel_unref(bridge);
}
}