summaryrefslogtreecommitdiff
path: root/Zend/zend_operators.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-10-08 17:19:52 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-10-08 17:19:52 +0200
commit7c1bc91e527cc64341ff581703be35b2391139ad (patch)
tree73ee554564dd9cd47476aaa3063f7ff2738d5801 /Zend/zend_operators.c
parent571a3bfc6c155ad5c13ddbcc9c0518eea4928f35 (diff)
parent21148679d1dfb614404c09a918d9d2b74f120640 (diff)
downloadphp-git-7c1bc91e527cc64341ff581703be35b2391139ad.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_operators.c')
-rw-r--r--Zend/zend_operators.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 6f939c0401..3a2dd76e15 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -2961,6 +2961,9 @@ process_double:
}
if (allow_errors == -1) {
zend_error(E_NOTICE, "A non well formed numeric value encountered");
+ if (EG(exception)) {
+ return 0;
+ }
}
}