Merged revisions 89457 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Tue, 20 Nov 2007 17:59:00 +0000 (17:59 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 20 Nov 2007 17:59:00 +0000 (17:59 +0000)
commitdda649ead2030258bcbf1a59ddd4c626d7e7f36b
tree0f0a40ad3d3bd3936a7c119a61321cb67f9d2bfe
parent6abfd9ac9bdd8acb34557ee6aac73d3d0c964aab
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
main/pbx.c