[asterisk-commits] kmoore: trunk r374793 - in /trunk: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Oct 10 08:40:40 2012
New Revision: 374793

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374793
Log:
Fix segfault regression from r370681

Due to usage of ast_hook_send_action, AMI action handling code should
be able to handle a NULL mansession->session.  This would cause a crash
on NULL dereference if action_originate was called from
ast_hook_send_action.

(closes issue ASTERISK-20544)
........

Merged revisions 374792 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=374793&r1=374792&r2=374793
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Oct 10 08:40:40 2012
@@ -4369,7 +4369,7 @@
 
 	/* Allocate requested channel variables */
 	vars = astman_get_variables(m);
-	if (s->session->chanvars) {
+	if (s->session && s->session->chanvars) {
 		struct ast_variable *v, *old;
 		old = vars;
 		vars = NULL;