[asterisk-commits] file: trunk r400285 - in /trunk: ./ res/res_pjsip_t38.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Oct  2 13:44:48 2013
New Revision: 400285

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400285
Log:
Fix a crash in res_pjsip_t38 caused by the wrong assumption that a session will always have a channel.

When starting up or shutting down this assumption is false.
........

Merged revisions 400284 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_t38.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Wed Oct  2 13:44:48 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-400181,400194,400196,400205,400217,400227,400236,400245,400254,400256,400265,400268,400270,400281
+/branches/12:1-398558,398560-398577,398579-399305,399307-400181,400194,400196,400205,400217,400227,400236,400245,400254,400256,400265,400268,400270,400281,400284

Modified: trunk/res/res_pjsip_t38.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_t38.c?view=diff&rev=400285&r1=400284&r2=400285
==============================================================================
--- trunk/res/res_pjsip_t38.c (original)
+++ trunk/res/res_pjsip_t38.c Wed Oct  2 13:44:48 2013
@@ -446,7 +446,8 @@
 		.event_cb = t38_framehook,
 	};
 
-	if ((ast_channel_state(session->channel) == AST_STATE_UP) || !session->endpoint->media.t38.enabled) {
+	if (!session->channel || (ast_channel_state(session->channel) == AST_STATE_UP) ||
+	    !session->endpoint->media.t38.enabled) {
 		return;
 	}