diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-11-26 21:20:03 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-11 16:17:55 +0100 |
| commit | a302d1161036988fe220ecd8ecd73e6af1a116fc (patch) | |
| tree | 59e2aa55f06813c5f42e505da8d5ba18f23feda5 /Zend/zend_execute.c | |
| parent | b65435c98674a4364786486be03e33b21e3d982c (diff) | |
| download | php-git-a302d1161036988fe220ecd8ecd73e6af1a116fc.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 d90e9ab075..a2f5206982 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -3757,7 +3757,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); } } |