Don't set a new value for the END_ variable on the channel before using the

old value.  If you do, it will lead to accessing a memory address that has
been free()'d.  (issue #8895, arkadia)

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

diff --git a/apps/app_while.c b/apps/app_while.c
index 736038ecd871fad1375834590e3a7eb5042e5246..1cd783469443026676d8ff7f504b25e62f77c025 100644 (file)
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -275,8 +275,8 @@ static int _while_exec(struct ast_channel *chan, void *data, int end)
                pbx_builtin_setvar_helper(chan, my_name, NULL);
         snprintf(end_varname,VAR_SIZE,"END_%s",varname);
                if ((goto_str=pbx_builtin_getvar_helper(chan, end_varname))) {
-                       pbx_builtin_setvar_helper(chan, end_varname, NULL);
                        ast_parseable_goto(chan, goto_str);
+                       pbx_builtin_setvar_helper(chan, end_varname, NULL);
                } else {
                        int pri = find_matching_endwhile(chan);
                        if (pri > 0) {