Revert "Fix zend_observer_fcall_end_all() accessing dangling pointers"

This reverts commit 76e2a83. Cf. <76e2a83#r62560239>.
php · Dec 27, 2021 · ee61094 · ee61094
1 parent 76e2a83
commit ee61094
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 30 deletions.
diff --git a/NEWS b/NEWS
@@ -6,8 +6,6 @@ PHP                                                                        NEWS
   . Fixed bug #81656 (GCC-11 silently ignores -R). (Michael Wallner)
   . Fixed bug #81585 (cached_chunks are not counted to real_size on shutdown).
     (cmb)
-  . Fixed zend_observer_fcall_end_all() accessing dangling pointers. (Florian
-    Sowade)
 
 - Filter:
   . Fixed FILTER_FLAG_NO_RES_RANGE flag. (Yifan Tong)

diff --git a/Zend/zend_observer.c b/Zend/zend_observer.c
@@ -229,7 +229,6 @@ ZEND_API void ZEND_FASTCALL zend_observer_fcall_end(
 		zend_execute_data *ex = execute_data->prev_execute_data;
 		while (ex && (!ex->func || ex->func->type == ZEND_INTERNAL_FUNCTION
 		          || !ZEND_OBSERVABLE_FN(ex->func->common.fn_flags)
-		          || !&RUN_TIME_CACHE(&ex->func->op_array)
 		          || !ZEND_OBSERVER_DATA(&ex->func->op_array)
 		          || ZEND_OBSERVER_DATA(&ex->func->op_array) == ZEND_OBSERVER_NOT_OBSERVED)) {
 			ex = ex->prev_execute_data;

diff --git a/ext/zend_test/tests/observer_bug81430_1.phpt b/ext/zend_test/tests/observer_bug81430_1.phpt