From ddddee697670d28896414e16316c9a39a9065f07 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 16 Oct 2008 23:37:37 +0000
Subject: [PATCH] Merged revisions 150302 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
r150302 | mmichelson | 2008-10-16 18:36:49 -0500 (Thu, 16 Oct 2008) | 24 lines

Merged revisions 150298,150301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r150298 | mmichelson | 2008-10-16 18:34:37 -0500 (Thu, 16 Oct 2008) | 10 lines

Don't try to call a dialplan function's read callback from
the manager's GetVar handler if an invalid channel has
been specified. Several dialplan functions, including
CHANNEL and SIP_HEADER, do not check for NULL-ness of
the channel being passed in.

(closes issue #13715)
Reported by: makoto


........
r150301 | mmichelson | 2008-10-16 18:35:07 -0500 (Thu, 16 Oct 2008) | 3 lines

And don't forget to return on the error condition


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@150303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/manager.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/manager.c b/main/manager.c
index 5dbc781e94..623bf853eb 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1804,6 +1804,10 @@ static int action_getvar(struct mansession *s, const struct message *m)
 	}
 
 	if (varname[strlen(varname) - 1] == ')') {
+		if (!c) {
+			astman_send_error(s, m, "No such channel");
+			return 0;
+		}
 		ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
 		varval = workspace;
 	} else {