diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-22 09:33:23 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-22 09:36:43 +0100 |
| commit | 6dd85f83f78fbafc4a90b264e577a31b59323314 (patch) | |
| tree | 77e85cba0151c4f722fe4c5753c1386dc0ec3068 /Zend/zend_execute.c | |
| parent | 84b615284218736f4fe2450a5f43ef61f2a78901 (diff) | |
| download | php-git-6dd85f83f78fbafc4a90b264e577a31b59323314.tar.gz | |
Fixed bug #80781
zend_find_array_dim_slow() may throw, make sure to handle this.
This backports the code we already use for this on PHP-8.0,
and also backports an exception check that makes this easier to
catch.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index f58b1131ba..90ffa5afb6 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -4555,6 +4555,7 @@ static zend_always_inline zend_execute_data *_zend_vm_stack_push_call_frame(uint if (check_exception) { \ OPLINE = EX(opline) + (skip); \ } else { \ + ZEND_ASSERT(!EG(exception)); \ OPLINE = opline + (skip); \ } \ ZEND_VM_CONTINUE() |