Skip to content

Commit d58c48d

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Revert "Fix zend_observer_fcall_end_all() accessing dangling pointers"
2 parents d4c07df + ee61094 commit d58c48d

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

NEWS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ PHP NEWS
1414
. Fixed bug GH-7757 (Multi-inherited final constant causes fatal error).
1515
(cmb)
1616
. Fixed zend_fibers.c build with ZEND_FIBER_UCONTEXT. (Petr Sumbera)
17-
. Fixed zend_observer_fcall_end_all() accessing dangling pointers. (Florian
18-
Sowade)
1917

2018
- Filter:
2119
. Fixed FILTER_FLAG_NO_RES_RANGE flag. (Yifan Tong)

Zend/zend_observer.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ ZEND_API void ZEND_FASTCALL zend_observer_fcall_end(
236236
zend_execute_data *ex = execute_data->prev_execute_data;
237237
while (ex && (!ex->func || ex->func->type == ZEND_INTERNAL_FUNCTION
238238
|| !ZEND_OBSERVABLE_FN(ex->func->common.fn_flags)
239-
|| !&RUN_TIME_CACHE(&ex->func->op_array)
240239
|| !ZEND_OBSERVER_DATA(&ex->func->op_array)
241240
|| ZEND_OBSERVER_DATA(&ex->func->op_array) == ZEND_OBSERVER_NOT_OBSERVED)) {
242241
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)