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

[Antony Dovgal]

tony2001                Fri Aug 10 13:20:22 2007 UTC

  Modified files:              
    /php-src/ext/standard       array.c 
  Log:
  empty/invalid names are not allowed (empty prefixes are)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.415&r2=1.416&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.415 php-src/ext/standard/array.c:1.416
--- php-src/ext/standard/array.c:1.415  Fri Aug 10 12:54:38 2007
+++ php-src/ext/standard/array.c        Fri Aug 10 13:20:22 2007
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.415 2007/08/10 12:54:38 tony2001 Exp $ */
+/* $Id: array.c,v 1.416 2007/08/10 13:20:22 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1272,7 +1272,7 @@
 {
        int i, ch;
 
-       if (!var_name.v) {
+       if (!var_name.v || !var_name_len) {
                return 0;
        }
 
@@ -1511,7 +1511,7 @@
                        convert_to_string(&final_name);
                }
 
-               if (Z_TYPE(final_name) != IS_NULL) {
+               if (Z_TYPE(final_name) != IS_NULL && 
php_valid_var_name(Z_UNIVAL(final_name), Z_UNILEN(final_name), 
Z_TYPE(final_name))) {
                        if (extract_refs) {
                                zval **orig_var;
 

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