Author: mmichelson Date: Fri Aug 22 11:56:57 2014 New Revision: 421883 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421883 Log: Fix a locking inversion in MixMonitor.
We need to unlock the audiohook before trying to lock the channel, since the correct locking order is channel then audiohook. ........ Merged revisions 421882 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/apps/app_mixmonitor.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/apps/app_mixmonitor.c URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_mixmonitor.c?view=diff&rev=421883&r1=421882&r2=421883 ============================================================================== --- trunk/apps/app_mixmonitor.c (original) +++ trunk/apps/app_mixmonitor.c Fri Aug 22 11:56:57 2014 @@ -743,13 +743,14 @@ "File: %s\r\n", ast_channel_name(mixmonitor->autochan->chan), mixmonitor->filename); + + ast_audiohook_unlock(&mixmonitor->audiohook); + ast_channel_lock(mixmonitor->autochan->chan); if (ast_test_flag(mixmonitor, MUXFLAG_BEEP_STOP)) { ast_stream_and_wait(mixmonitor->autochan->chan, "beep", ""); } ast_channel_unlock(mixmonitor->autochan->chan); - - ast_audiohook_unlock(&mixmonitor->audiohook); ast_autochan_destroy(mixmonitor->autochan); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
