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/branches/1.2@51197 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8f4f0d1ec5cea696520de70a429525db18fc2d68..a316065f291574206bf40a64efa8709537d20f85 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2782,11 +2782,11 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, char *title)
        ast_mutex_unlock(&i->lock);
        /* Don't hold a sip pvt lock while we allocate a channel */
        tmp = ast_channel_alloc(1);
-       ast_mutex_lock(&i->lock);
        if (!tmp) {
                ast_log(LOG_WARNING, "Unable to allocate SIP channel structure\n");
                return NULL;
        }
+       ast_mutex_lock(&i->lock);
        tmp->tech = &sip_tech;
        /* Select our native format based on codec preference until we receive
           something from another device to the contrary. */