[asterisk-commits] tilghman: trunk r61684 - in /trunk: ./ main/manager.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Wed Apr 18 23:37:29 2007
New Revision: 61684

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61684
Log:
Merged revisions 61683 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61683 | tilghman | 2007-04-18 23:36:20 -0500 (Wed, 18 Apr 2007) | 2 lines

Bug 9557 - simple reason why reading a function always returned NULL

........

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

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

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=61684&r1=61683&r2=61684
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Apr 18 23:37:29 2007
@@ -1483,7 +1483,7 @@
 	const char *name = astman_get_header(m, "Channel");
 	const char *varname = astman_get_header(m, "Variable");
 	char *varval;
-	char workspace[1024];
+	char workspace[1024] = "";
 
 	if (ast_strlen_zero(varname)) {
 		astman_send_error(s, m, "No variable specified");
@@ -1500,6 +1500,7 @@
 
 	if (varname[strlen(varname) - 1] == ')') {
 		ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
+		varval = workspace;
 	} else {
 		pbx_retrieve_variable(c, varname, &varval, workspace, sizeof(workspace), NULL);
 	}