summaryrefslogtreecommitdiff
path: root/channels/chan_h323.c
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-07-03 02:36:31 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-07-03 02:36:31 +0000
commitf4d96da591d8aa471ed1e4b4e1083eb7b301ee22 (patch)
tree4cab9f3225524ceb648e7d61ebc9af4ec5437d87 /channels/chan_h323.c
parentd31612410d2d603c6e2b6aeb1feed5bbeefc150e (diff)
Merged revisions 273793 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273793 | tilghman | 2010-07-02 16:36:39 -0500 (Fri, 02 Jul 2010) | 9 lines Have the DEADLOCK_AVOIDANCE macro warn when an unlock fails, to help catch potentially large software bugs. (closes issue #17407) Reported by: pdf Patches: 20100527__issue17407.diff.txt uploaded by tilghman (license 14) Review: https://reviewboard.asterisk.org/r/751/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_h323.c')
-rw-r--r--channels/chan_h323.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 3d07bceb4..10234199a 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -306,7 +306,7 @@ static int oh323_simulate_dtmf_end(const void *data)
if (pvt) {
ast_mutex_lock(&pvt->lock);
/* Don't hold pvt lock while trying to lock the channel */
- while(pvt->owner && ast_channel_trylock(pvt->owner)) {
+ while (pvt->owner && ast_channel_trylock(pvt->owner)) {
DEADLOCK_AVOIDANCE(&pvt->lock);
}