cvs: php-src(PHP_4_4) /ext/standard array.c
| From: | Ilia Alshanetsky | Date: | Mon, 03 Oct 2005 14:05:08 +0000 |
| Subject: | cvs: php-src(PHP_4_4) /ext/standard array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34262@lists.php.net to get a copy of this message | ||
iliaa Mon Oct 3 10:05:08 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.199.2.44.2.8&r2=1.199.2.44.2.9&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.44.2.8 php-src/ext/standard/array.c:1.199.2.44.2.9
--- php-src/ext/standard/array.c:1.199.2.44.2.8 Mon Sep 12 05:59:47 2005
+++ php-src/ext/standard/array.c Mon Oct 3 10:05:07 2005
@@ -22,7 +22,7 @@
*/
-/* $Id: array.c,v 1.199.2.44.2.8 2005/09/12 09:59:47 dmitry Exp $ */
+/* $Id: array.c,v 1.199.2.44.2.9 2005/10/03 14:05:07 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1252,6 +1252,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;