[PHP-CVS] cvs: php-src /ext/standard array.c basic_functions.c

[Dmitry Stogov]

dmitry          Wed Feb 22 13:10:32 2006 UTC

  Modified files:              
    /php-src/ext/standard       array.c basic_functions.c 
  Log:
  Unicode support: fixed GLOBALS protection
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/array.c?r1=1.341&r2=1.342&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.341 php-src/ext/standard/array.c:1.342
--- php-src/ext/standard/array.c:1.341  Tue Feb 21 20:12:42 2006
+++ php-src/ext/standard/array.c        Wed Feb 22 13:10:32 2006
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.341 2006/02/21 20:12:42 dmitry Exp $ */
+/* $Id: array.c,v 1.342 2006/02/22 13:10:32 dmitry Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1438,8 +1438,9 @@
                                /* break omitted intentionally */
 
                        case EXTR_OVERWRITE:
-                               /* FIXME: Unicode support??? */
-                               if (var_exists && !strcmp(var_name.s, 
"GLOBALS")) {
+                               if (var_exists && 
+                                       var_name_len == sizeof("GLOBALS") &&
+                                   ZEND_U_EQUAL(key_type, var_name, 
var_name_len-1, "GLOBALS", sizeof("GLOBALS")-1)) {
                                        break;
                                }
                        
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.756&r2=1.757&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.756 
php-src/ext/standard/basic_functions.c:1.757
--- php-src/ext/standard/basic_functions.c:1.756        Tue Feb 21 20:12:42 2006
+++ php-src/ext/standard/basic_functions.c      Wed Feb 22 13:10:32 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.756 2006/02/21 20:12:42 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.757 2006/02/22 13:10:32 dmitry Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -3179,8 +3179,8 @@
                if (!hash_key->nKeyLength) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric 
key detected - possible security hazard.");
                        return 0;
-               /* FIXME: Unicode support??? */
-               } else if (!strcmp(hash_key->arKey.s, "GLOBALS")) {
+               } else if (hash_key->nKeyLength == sizeof("GLOBALS") &&
+                          ZEND_U_EQUAL(hash_key->type, hash_key->arKey, 
hash_key->nKeyLength-1, "GLOBALS", sizeof("GLOBALS")-1)) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempted 
GLOBALS variable overwrite.");
                        return 0; 
                }

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