Skip to content

Commit ee61094

Browse files
committed
Revert "Fix zend_observer_fcall_end_all() accessing dangling pointers"
This reverts commit 76e2a83. Cf. <76e2a83#r62560239>.
1 parent 76e2a83 commit ee61094

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
@@ -6,8 +6,6 @@ PHP NEWS
66
. Fixed bug #81656 (GCC-11 silently ignores -R). (Michael Wallner)
77
. Fixed bug #81585 (cached_chunks are not counted to real_size on shutdown).
88
(cmb)
9-
. Fixed zend_observer_fcall_end_all() accessing dangling pointers. (Florian
10-
Sowade)
119

1210
- Filter:
1311
. 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
@@ -229,7 +229,6 @@ ZEND_API void ZEND_FASTCALL zend_observer_fcall_end(
229229
zend_execute_data *ex = execute_data->prev_execute_data;
230230
while (ex && (!ex->func || ex->func->type == ZEND_INTERNAL_FUNCTION
231231
|| !ZEND_OBSERVABLE_FN(ex->func->common.fn_flags)
232-
|| !&RUN_TIME_CACHE(&ex->func->op_array)
233232
|| !ZEND_OBSERVER_DATA(&ex->func->op_array)
234233
|| ZEND_OBSERVER_DATA(&ex->func->op_array) == ZEND_OBSERVER_NOT_OBSERVED)) {
235234
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)