Skip to content

Commit 1d44829

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Revert "Fix zend_observer_fcall_end_all() accessing dangling pointers"
2 parents a72a011 + d58c48d commit 1d44829

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

Zend/zend_observer.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ ZEND_API void ZEND_FASTCALL zend_observer_fcall_end(
238238
zend_execute_data *ex = execute_data->prev_execute_data;
239239
while (ex && (!ex->func || ex->func->type == ZEND_INTERNAL_FUNCTION
240240
|| !ZEND_OBSERVABLE_FN(ex->func->common.fn_flags)
241-
|| !&RUN_TIME_CACHE(&ex->func->op_array)
242241
|| !ZEND_OBSERVER_DATA(&ex->func->op_array)
243242
|| ZEND_OBSERVER_DATA(&ex->func->op_array) == ZEND_OBSERVER_NOT_OBSERVED)) {
244243
ex = ex->prev_execute_data;

ext/zend_test/tests/observer_bug81430_1.phpt

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)