diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-12 11:24:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-10-12 11:24:59 +0200 |
| commit | 5a7f9afb9902c45218a0fff9112d34e05be7b61c (patch) | |
| tree | 7263f88ef62ea504644f5695276352a005173b84 /Zend/zend_operators.c | |
| parent | 9a2e5cfccb3431614c84bfa1f4e1d66370698b6d (diff) | |
| parent | 3c4dd73c023e4aea317f774e045fdccc644f24b5 (diff) | |
| download | php-git-5a7f9afb9902c45218a0fff9112d34e05be7b61c.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Detect self-addition of array more accurately
Deindirect source elements in zend_hash_merge
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 08fc18f261..596581270b 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -934,7 +934,7 @@ ZEND_API zend_string* ZEND_FASTCALL zval_try_get_string_func(zval *op) /* {{{ */ static zend_never_inline void ZEND_FASTCALL add_function_array(zval *result, zval *op1, zval *op2) /* {{{ */ { - if ((result == op1) && (result == op2)) { + if (result == op1 && Z_ARR_P(op1) == Z_ARR_P(op2)) { /* $a += $a */ return; } |