Author: mjordan
Date: Wed Dec 24 10:59:42 2014
New Revision: 430111
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430111
Log:
main/pbx.c: Fix double lock of contexts lock introduced by r429967
We only need to hold the context_merge_lock once. Locking it twice will make
many other parts of Asterisk very sad.
ASTERISK-24641 #close
Modified:
trunk/main/pbx.c
Modified: trunk/main/pbx.c
URL:
http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=430111&r1=430110&r2=430111
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Dec 24 10:59:42 2014
@@ -11858,8 +11858,6 @@
return;
}
- ast_mutex_lock(&context_merge_lock);/* Hold off
ast_merge_contexts_and_delete */
-
cmpdevice = ast_alloca(sizeof(*cmpdevice) +
strlen(presence_state->provider));
strcpy(cmpdevice->hintdevice, presence_state->provider);
--
_____________________________________________________________________
-- 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
