[asterisk-commits] russell: trunk r51830 - in /trunk: ./ apps/app_while.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Jan 23 18:21:32 2007
New Revision: 51830

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

................
r51829 | russell | 2007-01-23 18:19:55 -0600 (Tue, 23 Jan 2007) | 12 lines

Merged revisions 51828 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51828 | russell | 2007-01-23 18:17:50 -0600 (Tue, 23 Jan 2007) | 4 lines

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)

........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_while.c

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

Modified: trunk/apps/app_while.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_while.c?view=diff&rev=51830&r1=51829&r2=51830
==============================================================================
--- trunk/apps/app_while.c (original)
+++ trunk/apps/app_while.c Tue Jan 23 18:21:32 2007
@@ -231,8 +231,8 @@
 		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))) {
+			ast_parseable_goto(chan, goto_str);
 			pbx_builtin_setvar_helper(chan, end_varname, NULL);
-			ast_parseable_goto(chan, goto_str);
 		} else {
 			int pri = find_matching_endwhile(chan);
 			if (pri > 0) {