From c9411643ea495d01ed67fa1ab9f30b835e5db95a Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Tue, 11 Mar 2008 01:27:23 +0000 Subject: [PATCH] Merged revisions 107292 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r107292 | twilson | 2008-03-10 20:09:46 -0500 (Mon, 10 Mar 2008) | 10 lines 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/branches/1.6.0@107336 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 40645214a0..248addc114 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5191,6 +5191,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);