From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 12 Sep 2017 22:45:57 +0000 (+0300)
Subject: Properly update string type flags
X-Git-Tag: php-7.0.25RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7a10f0e325ec588b7b5b0f5cb0b61c40161bec7;p=php

Properly update string type flags
---

diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index d2d0b966b2..3a62b6d72a 100644
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -219,8 +219,10 @@ ZEND_API void ZEND_FASTCALL _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC)
 {
 	if (EXPECTED(Z_TYPE_P(zvalue) == IS_ARRAY)) {
 		ZVAL_ARR(zvalue, zend_array_dup(Z_ARRVAL_P(zvalue)));
-	} else if (EXPECTED(Z_TYPE_P(zvalue) == IS_STRING) ||
-	           EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT)) {
+	} else if (EXPECTED(Z_TYPE_P(zvalue) == IS_STRING)) {
+		CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue));
+		ZVAL_NEW_STR(zvalue, zend_string_dup(Z_STR_P(zvalue), 0));
+	} else if (EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT)) {
 		CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue));
 		Z_STR_P(zvalue) = zend_string_dup(Z_STR_P(zvalue), 0);
 	} else if (EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT_AST)) {