[asterisk-commits] twilson: branch 1.6.0 r107336 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Mar 10 20:27:23 2008
New Revision: 107336

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

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=107336&r1=107335&r2=107336
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Mon Mar 10 20:27:23 2008
@@ -5191,6 +5191,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);