[svn-commits] twilson: trunk r107292 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Mon Mar 10 20:09:46 2008
New Revision: 107292

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107292
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=107292&r1=107291&r2=107292
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Mar 10 20:09:46 2008
@@ -5195,6 +5195,7 @@
 	}
 	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);