summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-01-30 11:03:14 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-01-30 11:05:04 +0100
commit98deece6f75c173e4847c5fd16b4c0b2ba0b47ac (patch)
tree2bacec5d9de822abb9985c97410605b6f9893c54
parent429f194f406e8d8255a12af210aa4bde3f9e1433 (diff)
downloadphp-git-98deece6f75c173e4847c5fd16b4c0b2ba0b47ac.tar.gz
Reset trampoline on executor startup
Make sure the trampoline is usable, even if we had an unclean shutdown on the last request.
-rw-r--r--Zend/zend_execute_API.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index e1001062e5..4277df1a1f 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;