iliaa Mon Oct 3 10:04:20 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/standard array.c Log: MFH: GLOBALS protection for extract() function. http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.308.2.4&r2=1.308.2.5&ty=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.4 php-src/ext/standard/array.c:1.308.2.5 --- php-src/ext/standard/array.c:1.308.2.4 Mon Sep 12 05:58:50 2005 +++ php-src/ext/standard/array.c Mon Oct 3 10:04:16 2005 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.308.2.4 2005/09/12 09:58:50 dmitry Exp $ */ +/* $Id: array.c,v 1.308.2.5 2005/10/03 14:04:16 iliaa Exp $ */ #include "php.h" #include "php_ini.h" @@ -1394,6 +1394,10 @@ /* break omitted intentionally */ case EXTR_OVERWRITE: + /* GLOBALS protection */ + if (var_exists && !strcmp(var_name, "GLOBALS")) { + break; + } smart_str_appendl(&final_name, var_name, var_name_len); break;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php