Merged revisions 94251 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 20 Dec 2007 20:16:21 +0000 (20:16 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 20 Dec 2007 20:16:21 +0000 (20:16 +0000)
commitd607a29ddfbd351be338b1742deeacad165035c6
tree016a78b350484763b94465a196a3d7a69640c315
parentb7adaa023c216acb6bd494a27758e4d6bfbed72d
Merged revisions 94251 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r94251 | russell | 2007-12-20 14:08:42 -0600 (Thu, 20 Dec 2007) | 10 lines

Fix a deadlock in d-channel handling in chan_zap.

This deadlock was introduced by the fix to ensure that channels are properly
locked when handling channel variables.  There were sections of this code where
the channel pvt was locked before the channel lock, when in fact it _must_ be
the other way around.

(closes issue #11582)
Reported by: bugi

........

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