[asterisk-commits] mnicholson: branch 1.6.2 r289553 - /branches/1.6.2/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Sep 30 14:51:27 2010
New Revision: 289553

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289553
Log:
Properly handle channel allocation failures duing invites with replaces.

ABE-2588

Modified:
    branches/1.6.2/channels/chan_sip.c

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=289553&r1=289552&r2=289553
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Thu Sep 30 14:51:27 2010
@@ -20252,7 +20252,8 @@
 			/* Initialize our tag */
 
 			make_our_tag(p->tag, sizeof(p->tag));
-			/* First invitation - create the channel */
+			/* First invitation - create the channel.  Allocation
+			 * failures are handled below. */
 			c = sip_new(p, AST_STATE_DOWN, S_OR(p->peername, NULL));
 			*recount = 1;
 
@@ -20412,7 +20413,7 @@
 	if (!req->ignore && p)
 		p->lastinvite = seqno;
 
-	if (replace_id) {	/* Attended transfer or call pickup - we're the target */
+	if (c && replace_id) {	/* Attended transfer or call pickup - we're the target */
 		if (!ast_strlen_zero(pickup.exten)) {
 			append_history(p, "Xfer", "INVITE/Replace received");