From: Terry Wilson <twilson@digium.com>
Date: Tue, 11 Mar 2008 01:09:46 +0000 (+0000)
Subject: Merged revisions 107290 via svnmerge from
X-Git-Tag: 1.6.0-beta7~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9a3f001e0973861efd0dff2ea04d8eb0404111a;p=thirdparty%2Fasterisk.git

Merged revisions 107290 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107290 | twilson | 2008-03-10 19:59:18 -0500 (Mon, 10 Mar 2008) | 2 lines

If we fail to alloc a channel, we should re-lock the pvt structure before returning.

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 39b2d27ea3..9f3b830433 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5195,6 +5195,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
 	}
 	if (!tmp) {
 		ast_log(LOG_WARNING, "Unable to allocate AST channel structure for SIP channel\n");
+		sip_pvt_lock(i);
 		return NULL;
 	}
 	sip_pvt_lock(i);