diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-12 23:42:51 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-12 23:42:51 +0300 |
| commit | 99b1a62d559f993ed02c50e6a4298c4bd2dcd33c (patch) | |
| tree | 2f56b5c4801bf7d816cc05a1d52cf752ca218278 | |
| parent | 7674b5e5749e8c0076357167ca553f153c94e6d1 (diff) | |
| download | php-git-99b1a62d559f993ed02c50e6a4298c4bd2dcd33c.tar.gz | |
Properly update string type flags
| -rw-r--r-- | Zend/zend_variables.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index d2d0b966b2..b16fb8424d 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -219,6 +219,13 @@ 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)); |