diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-13 01:45:57 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-13 01:45:57 +0300 |
| commit | d7a10f0e325ec588b7b5b0f5cb0b61c40161bec7 (patch) | |
| tree | 596822e6c501240ff1935c84eb66ec1ecf98ea18 | |
| parent | 83d8ebc9919a50f3927fa854e8f44203cdc8e9a2 (diff) | |
| download | php-git-d7a10f0e325ec588b7b5b0f5cb0b61c40161bec7.tar.gz | |
Properly update string type flags
| -rw-r--r-- | Zend/zend_variables.c | 6 |
1 files changed, 4 insertions, 2 deletions
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)) { |