[asterisk-commits] mnicholson: branch 1.8 r289554 - in /branches/1.8: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Sep 30 14:53:10 2010
New Revision: 289554

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289554
Log:
Merged revisions 289553 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r289553 | mnicholson | 2010-09-30 14:51:27 -0500 (Thu, 30 Sep 2010) | 4 lines
  
  Properly handle channel allocation failures duing invites with replaces.
  
  ABE-2588
........

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

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=289554&r1=289553&r2=289554
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Thu Sep 30 14:53:10 2010
@@ -21280,7 +21280,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), NULL);
 			if (cc_recall_core_id != -1) {
 				ast_setup_cc_recall_datastore(c, cc_recall_core_id);
@@ -21457,7 +21458,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");