diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-12 23:43:42 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-12 23:43:42 +0300 |
| commit | 7452fd0263917667dcd8e743d15b9e9b3f7ee6dd (patch) | |
| tree | 4572e3ff949b2da715cdd432ecc167eaf10018d3 /Zend/zend_variables.c | |
| parent | fcad6a97b860281f0cc13e89d8b272beb75046e5 (diff) | |
| parent | 99b1a62d559f993ed02c50e6a4298c4bd2dcd33c (diff) | |
| download | php-git-7452fd0263917667dcd8e743d15b9e9b3f7ee6dd.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Properly update string type flags
Diffstat (limited to 'Zend/zend_variables.c')
| -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 aed16f6600..c54009dfa0 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -167,6 +167,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)); |