diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-08 16:53:23 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-08 17:17:49 +0200 |
| commit | 21148679d1dfb614404c09a918d9d2b74f120640 (patch) | |
| tree | ae845ee337a9b982fe0e5c1632a42ab0560ee83a /Zend/zend_operators.c | |
| parent | 68b26ff8cf2390ba5b7565b6624485f2ee6afbf6 (diff) | |
| download | php-git-21148679d1dfb614404c09a918d9d2b74f120640.tar.gz | |
Handle "non well formed" exception during ZPP
Previously if the "non well formed" notice was converted into an
exception we'd still end up executing the function.
Also drop the now unnecessary EG(exception) checks in the engine.
Additionally remote a bogus exception in zend_is_callable: It
should only be writing to error, but not directly throwing.
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 840ee75a41..7c0c569164 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -3131,6 +3131,9 @@ process_double: } if (allow_errors == -1) { zend_error(E_NOTICE, "A non well formed numeric value encountered"); + if (EG(exception)) { + return 0; + } } } |