diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-30 11:05:56 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-30 11:05:56 +0100 |
| commit | cb7b21009b951d6a08fa948c775c141f6666204c (patch) | |
| tree | b077e0c5f9638603d15c6fe1d522c87e5f4aef48 /Zend/zend_API.c | |
| parent | 146848429605752e156a9f0ced4bfb079720d094 (diff) | |
| parent | 98deece6f75c173e4847c5fd16b4c0b2ba0b47ac (diff) | |
| download | php-git-cb7b21009b951d6a08fa948c775c141f6666204c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Reset trampoline on executor startup
Fix UAF in is_callable() and allocated trampoline
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 8ca81fc7d0..f826af856d 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2963,12 +2963,7 @@ get_function_via_handler: if (strict_class && (!fcc->function_handler->common.scope || !instanceof_function(ce_org, fcc->function_handler->common.scope))) { - if (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { - if (fcc->function_handler->common.function_name) { - zend_string_release_ex(fcc->function_handler->common.function_name, 0); - } - zend_free_trampoline(fcc->function_handler); - } + zend_release_fcall_info_cache(fcc); } else { retval = 1; call_via_handler = (fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) != 0; |