[svn-commits] mmichelson: branch 1.6.1 r150303 - in /branches/1.6.1: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Oct 16 18:37:37 2008
New Revision: 150303

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150303
Log:
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


........

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/manager.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/manager.c?view=diff&rev=150303&r1=150302&r2=150303
==============================================================================
--- branches/1.6.1/main/manager.c (original)
+++ branches/1.6.1/main/manager.c Thu Oct 16 18:37:37 2008
@@ -1804,6 +1804,10 @@
 	}
 
 	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 {