Merged revisions 95577 via svnmerge from

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

........
r95577 | mmichelson | 2007-12-31 17:43:13 -0600 (Mon, 31 Dec 2007) | 9 lines

Avoiding a potentially bad locking situation. ast_merge_contexts_and_delete writelocks the conlock, then
calls ast_hint_extension, which attempts to readlock the same lock. Recursion with read-write locks is
dangerous, so the inner lock needs to be removed. I did this by copying the "guts" of ast_hint_extension
into ast_merge_contexts_and_delete (sans the extra lock).

(this change is inspired by the locking problems seen in issue #11080, but I have no idea if this is the
problematic area experienced by the reporters of that issue)

........

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

diff --git a/main/pbx.c b/main/pbx.c
index 2671733d8168329cec924d1e6095c5691707e62b..64e34a41970d91752a298a821bc74adfa50e824a 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -5211,7 +5211,8 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, const char
           cannot be restored
        */
        while ((this = AST_LIST_REMOVE_HEAD(&store, list))) {
-               exten = ast_hint_extension(NULL, this->context, this->exten);
+               struct pbx_find_info q = { .stacklen = 0 };
+               exten = pbx_find_extension(NULL, NULL, &q, this->context, this->exten, PRIORITY_HINT, NULL, "", E_MATCH);
                /* Find the hint in the list of hints */
                AST_RWLIST_TRAVERSE(&hints, hint, list) {
                        if (hint->exten == exten)