iliaa           Mon Oct  3 10:01:37 2005 EDT

  Modified files:              
    /php-src/ext/standard       array.c 
  Log:
  GLOBALS protection for extract() function.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.325&r2=1.326&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.325 php-src/ext/standard/array.c:1.326
--- php-src/ext/standard/array.c:1.325  Mon Sep 12 05:58:35 2005
+++ php-src/ext/standard/array.c        Mon Oct  3 10:01:36 2005
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.325 2005/09/12 09:58:35 dmitry Exp $ */
+/* $Id: array.c,v 1.326 2005/10/03 14:01:36 iliaa Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1459,6 +1459,10 @@
                                /* break omitted intentionally */
 
                        case EXTR_OVERWRITE:
+                               if (var_exists && !strcmp(var_name, "GLOBALS")) 
{
+                                       break;
+                               }
+                       
                                ZVAL_TEXTL(&final_name, var_name, var_name_len, 
1);
                                break;
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to