[svn-commits] bebuild: tag 11.12.1 r423446 - in /tags/11.12.1: ./ res/

[SVN commits to the Digium repositories]

Author: bebuild
Date: Thu Sep 18 12:26:19 2014
New Revision: 423446

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423446
Log:
Merge fix for AST-2014-010

Modified:
    tags/11.12.1/   (props changed)
    tags/11.12.1/ChangeLog
    tags/11.12.1/res/res_fax_spandsp.c

Propchange: tags/11.12.1/
------------------------------------------------------------------------------
    svn:mergeinfo = /branches/11:423360

Modified: tags/11.12.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/11.12.1/ChangeLog?view=diff&rev=423446&r1=423445&r2=423446
==============================================================================
--- tags/11.12.1/ChangeLog (original)
+++ tags/11.12.1/ChangeLog Thu Sep 18 12:26:19 2014
@@ -1,3 +1,24 @@
+2014-09-18  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 11.12.1 Released.
+
+	* AST-2014-010: Resolve crash when the Message channel technology
+	  enters into the ReceiveFax application using res_fax_spandsp
+
+	  If faxing fails at a very early stage, then it is possible for
+	  us to pass a NULL t30 state pointer to spandsp, which spandsp
+	  is none too pleased with.
+
+	  This patch ensures that we pass the correct pointer to spandsp
+	  in the situation where we have not yet set our local t30 state
+	  pointer.
+
+	  An advisory was made for this issue due to the likelihood of
+	  it occurring in some Asterisk configurations.
+
+	  ASTERISK-24301 #close
+	  Reported by Matt Jordan, Philippe Lindheimer
+
 2014-08-19  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 11.12.0 Released.

Modified: tags/11.12.1/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.12.1/res/res_fax_spandsp.c?view=diff&rev=423446&r1=423445&r2=423446
==============================================================================
--- tags/11.12.1/res/res_fax_spandsp.c (original)
+++ tags/11.12.1/res/res_fax_spandsp.c Thu Sep 18 12:26:19 2014
@@ -176,8 +176,25 @@
 static void session_destroy(struct spandsp_pvt *p)
 {
 	struct ast_frame *f;
-
-	t30_terminate(p->t30_state);
+	t30_state_t *t30_to_terminate;
+
+	if (p->t30_state) {
+		t30_to_terminate = p->t30_state;
+	} else if (p->ist38) {
+#if SPANDSP_RELEASE_DATE >= 20080725
+		t30_to_terminate = &p->t38_state.t30;
+#else
+		t30_to_terminate = &p->t38_state.t30_state;
+#endif
+	} else {
+#if SPANDSP_RELEASE_DATE >= 20080725
+		t30_to_terminate = &p->fax_state.t30;
+#else
+		t30_to_terminate = &p->fax_state.t30_state;
+#endif
+	}
+
+	t30_terminate(t30_to_terminate);
 	p->isdone = 1;
 
 	ast_timer_close(p->timer);