Merged revisions 51198 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 17 Jan 2007 21:20:22 +0000 (21:20 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 17 Jan 2007 21:20:22 +0000 (21:20 +0000)
commitc56f9184e88e035c861e78fc80119d6103d1d5fd
tree57b6ee3392767fcf39c599051b456013161d2c77
parenta48fdb83a5957a6d978507eda0e59b5866c7e68a
Merged revisions 51198 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r51198 | russell | 2007-01-17 15:18:35 -0600 (Wed, 17 Jan 2007) | 11 lines

Merged revisions 51197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51197 | russell | 2007-01-17 15:17:21 -0600 (Wed, 17 Jan 2007) | 3 lines

Move the check for a failure of ast_channel_alloc() to before locking the
pvt structure again.  Otherwise, on a failure, this will cause a deadlock.

........

................

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