]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Prevent a potential crash when using manager hooks.
authorJason Parker <jparker@digium.com>
Tue, 1 May 2012 21:46:23 +0000 (21:46 +0000)
committerJason Parker <jparker@digium.com>
Tue, 1 May 2012 21:46:23 +0000 (21:46 +0000)
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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@364843 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/manager.c

index 172b47c358d52bd3e4450f8b13a2782142e53daf..d5c95bac3356960e70905cc8fc0c1bab3b4d6937 100644 (file)
@@ -4086,7 +4086,7 @@ static int action_originate(struct mansession *s, const struct message *m)
                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)