[asterisk-commits] bebuild: tag 11.8.0-rc3 r409303 - in /tags/11.8.0-rc3: ./ channels/

[SVN commits to the Asterisk project]

Author: bebuild
Date: Sat Mar  1 17:30:16 2014
New Revision: 409303

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409303
Log:
Merge r409157 for 11.8.0-rc3

Modified:
    tags/11.8.0-rc3/   (props changed)
    tags/11.8.0-rc3/ChangeLog
    tags/11.8.0-rc3/channels/chan_sip.c

Propchange: tags/11.8.0-rc3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar  1 17:30:16 2014
@@ -1,2 +1,2 @@
-/branches/11:409053,409129-409130
+/branches/11:409053,409129-409130,409157
 /certified/branches/1.8.15:382389

Modified: tags/11.8.0-rc3/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/11.8.0-rc3/ChangeLog?view=diff&rev=409303&r1=409302&r2=409303
==============================================================================
--- tags/11.8.0-rc3/ChangeLog (original)
+++ tags/11.8.0-rc3/ChangeLog Sat Mar  1 17:30:16 2014
@@ -1,3 +1,19 @@
+2014-03-01  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 11.8.0-rc3 Released.
+
+	* chan_sip: Fix crash in ast_channel_hangupcause_set().
+
+	  Fix crash in ast_channel_hangupcause_set() because p->owner not
+	  checked before calling.  Regression introduced by the fix for
+	  ASTERISK-22621.
+
+	  (closes issue ASTERISK-23135)
+	  Reported by: OK
+
+	  (issue ASTERISK-23323)
+	  Reported by: Walter Doekes
+
 2014-02-27  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 11.8.0-rc2 Released.

Modified: tags/11.8.0-rc3/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.8.0-rc3/channels/chan_sip.c?view=diff&rev=409303&r1=409302&r2=409303
==============================================================================
--- tags/11.8.0-rc3/channels/chan_sip.c (original)
+++ tags/11.8.0-rc3/channels/chan_sip.c Sat Mar  1 17:30:16 2014
@@ -22856,9 +22856,11 @@
 					/* This 200 OK's SDP is not acceptable, so we need to ack, then hangup */
 					/* For re-invites, we try to recover */
 					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
-					ast_channel_hangupcause_set(p->owner, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
 					p->hangupcause = AST_CAUSE_BEARERCAPABILITY_NOTAVAIL;
-					sip_queue_hangup_cause(p, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
+					if (p->owner) {
+						ast_channel_hangupcause_set(p->owner, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
+						sip_queue_hangup_cause(p, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
+					}
 				}
 			}
 			ast_rtp_instance_activate(p->rtp);