diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-26 21:20:03 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-01-31 07:11:05 +0100 |
| commit | abd36289e26cc0365e82373699aba4c1ffff464d (patch) | |
| tree | 1c94078f70ba7a8a4f098236e780ee9de9136179 /Zend/zend_execute.c | |
| parent | 25dc5f18e44686836b18851baeb348c86eeede7c (diff) | |
| download | php-git-abd36289e26cc0365e82373699aba4c1ffff464d.tar.gz | |
Don't silence fatal errors with @
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 2b832b6f0d..03c621f08f 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -3755,7 +3755,8 @@ static void cleanup_live_vars(zend_execute_data *execute_data, uint32_t op_num, } } else if (kind == ZEND_LIVE_SILENCE) { /* restore previous error_reporting value */ - if (!EG(error_reporting) && Z_LVAL_P(var) != 0) { + if (E_HAS_ONLY_FATAL_ERRORS(EG(error_reporting)) + && !E_HAS_ONLY_FATAL_ERRORS(Z_LVAL_P(var))) { EG(error_reporting) = Z_LVAL_P(var); } } |