automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40920 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_agi.c b/res/res_agi.c
index 935e4f1d6083f089584729664a1d5522c7f38481..e9b275ed0b8e2b7a9d7d605315ccfbdfe033df1a 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1161,17 +1161,18 @@ static int handle_setvariable(struct ast_channel *chan, AGI *agi, int argc, char
 
 static int handle_getvariable(struct ast_channel *chan, AGI *agi, int argc, char **argv)
 {
-       const char *ret;
+       char *ret;
        char tempstr[1024];
 
        if (argc != 3)
                return RESULT_SHOWUSAGE;
 
        /* check if we want to execute an ast_custom_function */
-       if (!ast_strlen_zero(argv[2]) && (argv[2][strlen(argv[2]) - 1] == ')'))
+       if (!ast_strlen_zero(argv[2]) && (argv[2][strlen(argv[2]) - 1] == ')')) {
                ret = ast_func_read(chan, argv[2], tempstr, sizeof(tempstr));
-       else
-               ret = pbx_builtin_getvar_helper(chan, argv[2]);
+       } else {
+               pbx_retrieve_variable(chan, argv[2], &ret, tempstr, sizeof(tempstr), NULL);
+       }
 
        if (ret)
                fdprintf(agi->fd, "200 result=1 (%s)\n", ret);