diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-13 00:14:39 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-13 00:14:39 +0300 |
| commit | 83d8ebc9919a50f3927fa854e8f44203cdc8e9a2 (patch) | |
| tree | 24cf2ec94ae27fea0cfb1df99af7717403a1853c | |
| parent | 2874fa8fb024ff30cc15181a1a10bffbacee08dc (diff) | |
| download | php-git-83d8ebc9919a50f3927fa854e8f44203cdc8e9a2.tar.gz | |
Revert "Properly update string type flags"
This reverts commit 99b1a62d559f993ed02c50e6a4298c4bd2dcd33c.
| -rw-r--r-- | Zend/zend_variables.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index b16fb8424d..d2d0b966b2 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -219,13 +219,6 @@ 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)) { - 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); - Z_TYPE_INFO_P(zvalue) = IS_CONSTANT_EX; } else if (EXPECTED(Z_TYPE_P(zvalue) == IS_STRING) || EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT)) { CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); |