From: Marcus Boerger <helly@php.net>
Date: Sat, 2 Feb 2008 14:03:13 +0000 (+0000)
Subject: - It appears HEAD needs to be MFB'ed and this needs another fix now
X-Git-Tag: RELEASE_1_3_1~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3c1a9fa02c6cac642b884d2848d217ac1e707f8;p=php

- It appears HEAD needs to be MFB'ed and this needs another fix now
---

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);
 	}