From 72eb8eb1e7ee0e097c1124a9c12cc984a670ee24 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 11 Jun 2012 17:34:08 +0000 Subject: Fix deadlock potential with ast_set_hangupsource() calls. 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 --- include/asterisk/channel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index f183fe00e..170755b79 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1388,6 +1388,8 @@ void ast_channel_clear_softhangup(struct ast_channel *chan, int flag); * \param source a string describing the source of the hangup for this channel * \param force * + * \note Absolutely _NO_ channel locks should be held before calling this function. + * * \since 1.8 * * Hangupsource is generally the channel name that caused the bridge to be -- cgit v1.2.3