From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 16 Apr 2014 18:42:37 +0000 (+0400)
Subject: Prevented modification of original name
X-Git-Tag: POST_PHPNG_MERGE~412^2~82^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=320bf772c6d72c28d2d3ecb0e9f428a4a31edf9b;p=php

Prevented modification of original name
---

diff --git a/ext/standard/type.c b/ext/standard/type.c
index 3feac632d8..c4fdbc87e3 100644
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -387,14 +387,16 @@ PHP_FUNCTION(is_callable)
 		check_flags |= IS_CALLABLE_CHECK_SYNTAX_ONLY;
 	}
 	if (ZEND_NUM_ARGS() > 2) {
-		if (callable_name) {
-			ZVAL_DEREF(callable_name);
-		}
+		ZVAL_DEREF(callable_name);
 		retval = zend_is_callable_ex(var, NULL, check_flags, &name, NULL, &error TSRMLS_CC);
 		zval_dtor(callable_name);
 		//??? is it necessary to be consistent with old PHP ("\0" support)
-		name->len = strlen(name->val);
-		ZVAL_STR(callable_name, name);
+		if (UNEXPECTED(name->len) != strlen(name->val)) {
+			ZVAL_STRINGL(callable_name, name->val, strlen(name->val));
+			STR_RELEASE(name);
+		} else {
+			ZVAL_STR(callable_name, name);
+		}
 	} else {
 		retval = zend_is_callable_ex(var, NULL, check_flags, NULL, NULL, &error TSRMLS_CC);
 	}