Merged revisions 89457 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89457 | mmichelson | 2007-11-20 11:50:31 -0600 (Tue, 20 Nov 2007) | 9 lines

According to comments in main/pbx.c, it is essential that if we are going to lock
the conlock as well as the hints lock, it must be locked in that respective order.
In order to prevent a potential deadlock, we need to lock the conlock prior to
locking the hints lock in ast_hint_state_changed (see the call stack example on
issue #11323 for how this can happen).

(closes issue #11323, reported  by eelcob, suggestion for patch by eelcob, patch by me)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89458 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index 7262df6d19a99d7695819bda59bd7b6c971f443f..cd8a23ca88a71c5332d9ac8a38019087c56a81b6 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2742,6 +2742,7 @@ static void handle_statechange(const char *device)
 {
        struct ast_hint *hint;
 
+       ast_rdlock_contexts();
        AST_RWLIST_RDLOCK(&hints);
 
        AST_RWLIST_TRAVERSE(&hints, hint, list) {
@@ -2779,6 +2780,7 @@ static void handle_statechange(const char *device)
        }
 
        AST_RWLIST_UNLOCK(&hints);
+       ast_unlock_contexts();
 }
 
 static int statechange_queue(const char *dev)