diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-31 17:06:08 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-31 17:06:21 +0200 |
| commit | 4acac9bd72630c8dea2d61bf9b550814467e54db (patch) | |
| tree | 44b840abb0cdf0a753c82798753ea431996c1f19 /Zend/zend_operators.c | |
| parent | 2022f2e5c905995c79fa08bb6955777573f32669 (diff) | |
| parent | 9560e3ba7ab64e3fb9815253e33095d11e83e978 (diff) | |
| download | php-git-4acac9bd72630c8dea2d61bf9b550814467e54db.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix leak on assign concat of array and empty string
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 7de4cd8ad7..4d20d56464 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1861,6 +1861,9 @@ ZEND_API zend_result ZEND_FASTCALL concat_function(zval *result, zval *op1, zval } } else if (UNEXPECTED(Z_STRLEN_P(op2) == 0)) { if (EXPECTED(result != op1)) { + if (result == orig_op1) { + i_zval_ptr_dtor(result); + } ZVAL_COPY(result, op1); } } else { |