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_execute_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_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index a1bae5ea3a..e2410cf6af 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -173,6 +173,7 @@ void init_executor(void) /* {{{ */ EG(prev_exception) = NULL; EG(fake_scope) = NULL; + EG(trampoline).common.function_name = NULL; EG(ht_iterators_count) = sizeof(EG(ht_iterators_slots)) / sizeof(HashTableIterator); EG(ht_iterators_used) = 0; |