helly Sat Feb 2 14:03:13 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard type.c Log: - It appears HEAD needs to be MFB'ed and this needs another fix now http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.30.2.2.2.3.2.4&r2=1.30.2.2.2.3.2.5&diff_format=u Index: php-src/ext/standard/type.c diff -u php-src/ext/standard/type.c:1.30.2.2.2.3.2.4 php-src/ext/standard/type.c:1.30.2.2.2.3.2.5 --- php-src/ext/standard/type.c:1.30.2.2.2.3.2.4 Sat Feb 2 13:58:31 2008 +++ php-src/ext/standard/type.c Sat Feb 2 14:03:13 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: type.c,v 1.30.2.2.2.3.2.4 2008/02/02 13:58:31 helly Exp $ */ +/* $Id: type.c,v 1.30.2.2.2.3.2.5 2008/02/02 14:03:13 helly Exp $ */ #include "php.h" #include "php_incomplete_class.h" @@ -360,7 +360,7 @@ PHP_FUNCTION(is_callable) { zval *var, **callable_name; - zval name; + char *name; zend_bool retval; zend_bool syntax_only = 0; @@ -372,7 +372,8 @@ syntax_only = syntax_only ? IS_CALLABLE_CHECK_SYNTAX_ONLY : 0; if (ZEND_NUM_ARGS() > 2) { retval = zend_is_callable(var, syntax_only, &name); - REPLACE_ZVAL_VALUE(callable_name, &name, 0); + zval_dtor(*callable_name); + ZVAL_STRING(*callable_name, name, 0); } else { retval = zend_is_callable(var, syntax_only, NULL); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php