From f3c1a9fa02c6cac642b884d2848d217ac1e707f8 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sat, 2 Feb 2008 14:03:13 +0000 Subject: [PATCH] - It appears HEAD needs to be MFB'ed and this needs another fix now --- ext/standard/type.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/standard/type.c b/ext/standard/type.c index c44bf6f98e..88b77844ac 100644 --- a/ext/standard/type.c +++ b/ext/standard/type.c @@ -360,7 +360,7 @@ PHP_FUNCTION(is_scalar) PHP_FUNCTION(is_callable) { zval *var, **callable_name; - zval name; + char *name; zend_bool retval; zend_bool syntax_only = 0; @@ -372,7 +372,8 @@ PHP_FUNCTION(is_callable) 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); } -- 2.40.0