[asterisk-commits] qwell: branch 10-digiumphones r364843 - in /branches/10-digiumphones: ./ main/

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue May  1 16:46:23 2012
New Revision: 364843

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364843
Log:
Prevent a potential crash when using manager hooks.

Found by me while poking at DPMA-127.
........

Merged revisions 364841 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 364842 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    branches/10-digiumphones/   (props changed)
    branches/10-digiumphones/main/manager.c

Propchange: branches/10-digiumphones/
------------------------------------------------------------------------------
--- branch-10-merged (original)
+++ branch-10-merged Tue May  1 16:46:23 2012
@@ -1,1 +1,1 @@
-/branches/10:1-361139
+/branches/10:1-361139,364842

Modified: branches/10-digiumphones/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/10-digiumphones/main/manager.c?view=diff&rev=364843&r1=364842&r2=364843
==============================================================================
--- branches/10-digiumphones/main/manager.c (original)
+++ branches/10-digiumphones/main/manager.c Tue May  1 16:46:23 2012
@@ -4086,7 +4086,7 @@
 		ast_parse_allow_disallow(NULL, cap, codecs, 1);
 	}
 
-	if (!ast_strlen_zero(app)) {
+	if (!ast_strlen_zero(app) && s->session) {
 		/* To run the System application (or anything else that goes to
 		 * shell), you must have the additional System privilege */
 		if (!(s->session->writeperm & EVENT_FLAG_SYSTEM)