From 00be6e1aed5e55c04f716a7364ff55e698e154a5 Mon Sep 17 00:00:00 2001
From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 30 Jan 2023 12:32:53 +0100
Subject: [PATCH] Look at executing generator for fiber destructor behaviour

---
 Zend/tests/fibers/get-return-after-bailout.phpt | 7 +++++++
 Zend/tests/generators/gh9801.phpt               | 7 +++++++
 Zend/zend_generators.c                          | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Zend/tests/fibers/get-return-after-bailout.phpt b/Zend/tests/fibers/get-return-after-bailout.phpt
index 0f004070251..04bd464cfab 100644
--- a/Zend/tests/fibers/get-return-after-bailout.phpt
+++ b/Zend/tests/fibers/get-return-after-bailout.phpt
@@ -1,5 +1,12 @@
 --TEST--
 Fiber::getReturn() after bailout
+--SKIPIF--
+<?php
+$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
+if ($zend_mm_enabled === "0") {
+    die("skip Zend MM disabled");
+}
+?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/generators/gh9801.phpt b/Zend/tests/generators/gh9801.phpt
index cc229ab0db8..0d5990f9ba4 100644
--- a/Zend/tests/generators/gh9801.phpt
+++ b/Zend/tests/generators/gh9801.phpt
@@ -2,6 +2,13 @@
 Bug GH-9801 (Crash when memory limit is exceeded during generator initialization)
 --INI--
 memory_limit=16m
+--SKIPIF--
+<?php
+$zend_mm_enabled = getenv("USE_ZEND_ALLOC");
+if ($zend_mm_enabled === "0") {
+    die("skip Zend MM disabled");
+}
+?>
 --FILE--
 <?php
 
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 65feafc1b69..a192170cae3 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -225,7 +225,7 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 
 	/* Generator is running in a suspended fiber.
 	 * Will be dtor during fiber dtor */
-	if (generator->flags & ZEND_GENERATOR_IN_FIBER) {
+	if (zend_generator_get_current(generator)->flags & ZEND_GENERATOR_IN_FIBER) {
 		/* Prevent finally blocks from yielding */
 		generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
 		return;