diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-26 16:10:29 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-26 16:12:34 +0200 |
| commit | 247105ae1ae2a04608078f7fcfe88dacab9f55a4 (patch) | |
| tree | 9d68b089602be6cad64afcb582cd168c9ac09085 /Zend/zend_execute.c | |
| parent | 8e2f219fad5dba2c4c5f83bcc770df5697cb71d3 (diff) | |
| download | php-git-247105ae1ae2a04608078f7fcfe88dacab9f55a4.tar.gz | |
Property handle read_property exception in fetch_property_address
Otherwise we leak (and corrupt uninitialized_zval).
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index c5b502501e..6a6ad61094 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2872,6 +2872,10 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c } return; } + if (UNEXPECTED(EG(exception))) { + ZVAL_ERROR(result); + return; + } } else if (UNEXPECTED(Z_ISERROR_P(ptr))) { ZVAL_ERROR(result); return; |