diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-13 01:46:12 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-13 01:46:12 +0300 |
| commit | c24b3eff110dafbdb980d3ebfc20db575cfec519 (patch) | |
| tree | 8394819520e96aa26cb7ebcdc849868e8a225fdc /Zend/zend_variables.c | |
| parent | 5f1d553e7ef52c7d35caa31bcefcf174fa454795 (diff) | |
| parent | d7a10f0e325ec588b7b5b0f5cb0b61c40161bec7 (diff) | |
| download | php-git-c24b3eff110dafbdb980d3ebfc20db575cfec519.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index aed16f6600..6c1e235eb6 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -167,8 +167,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)) { |