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

[Antony Dovgal]

tony2001                Fri May 18 14:11:12 2007 UTC

  Modified files:              
    /php-src/ext/standard       array.c 
  Log:
  fix #41432 (extract() does not accept empty prefix)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.406&r2=1.407&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.406 php-src/ext/standard/array.c:1.407
--- php-src/ext/standard/array.c:1.406  Sun Mar 18 20:23:51 2007
+++ php-src/ext/standard/array.c        Fri May 18 14:11:12 2007
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.406 2007/03/18 20:23:51 wez Exp $ */
+/* $Id: array.c,v 1.407 2007/05/18 14:11:12 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1393,7 +1393,7 @@
 
        if (prefix) {
                convert_to_text(prefix);
-               if (!php_valid_var_name(Z_UNIVAL_P(prefix), Z_UNILEN_P(prefix), 
Z_TYPE_P(prefix))) {
+               if (Z_UNILEN_P(prefix) && 
!php_valid_var_name(Z_UNIVAL_P(prefix), Z_UNILEN_P(prefix), Z_TYPE_P(prefix))) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "prefix is 
not a valid identifier");
                        return;
                }

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