From 2c22bd741840e15eb7dc7d714c3ed1805a83e014 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Fri, 1 Nov 2024 02:24:34 +0100
Subject: [PATCH 1/3] Fix bug77578.phpt

---
 Zend/zend_constants.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 9206eb8e1638..40b0f3f4ecfa 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -56,7 +56,7 @@ void free_zend_constant(zval *zv)
 			zend_string_release_ex(c->name, 1);
 		}
 		if (c->filename) {
-			zend_string_release_ex(c->filename, 1);
+			zend_string_release(c->filename);
 		}
 		free(c);
 	}

From 94c2e4cfe76c50c727c455eaedc4edf68f7a4780 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Fri, 1 Nov 2024 12:29:21 +0100
Subject: [PATCH 2/3] Revert "Fix bug77578.phpt"

This reverts commit 2c22bd741840e15eb7dc7d714c3ed1805a83e014.
---
 Zend/zend_constants.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 40b0f3f4ecfa..9206eb8e1638 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -56,7 +56,7 @@ void free_zend_constant(zval *zv)
 			zend_string_release_ex(c->name, 1);
 		}
 		if (c->filename) {
-			zend_string_release(c->filename);
+			zend_string_release_ex(c->filename, 1);
 		}
 		free(c);
 	}

From e7cc323081b2fda7cf2df23d251e7bccdc3c65c0 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Fri, 1 Nov 2024 12:33:16 +0100
Subject: [PATCH 3/3] Avoid dl() in bug77578.phpt

`dl()` has known issues regarding permanent strings[1], so we better
avoid it, even if that means that we need to spawn two sub-processes.

[1] <https://github.com/php/php-src/issues/9196>
---
 ext/com_dotnet/tests/bug77578.phpt | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/ext/com_dotnet/tests/bug77578.phpt b/ext/com_dotnet/tests/bug77578.phpt
index a820935d5d77..e25230f76f49 100644
--- a/ext/com_dotnet/tests/bug77578.phpt
+++ b/ext/com_dotnet/tests/bug77578.phpt
@@ -6,18 +6,33 @@ com_dotnet
 <?php
 // To actually be able to verify the crash during shutdown on Windows, we have
 // to execute a PHP subprocess, and check its exit status.
+
+// First we determine whether com_dotnet would be loaded in the subprocess
 $php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
-$extension_dir = escapeshellarg(ini_get("extension_dir"));
 $script = <<<SCRIPT
-if (!extension_loaded('com_dotnet')) dl('com_dotnet');
+echo extension_loaded('com_dotnet') ? 'yes' : 'no';
+SCRIPT;
+exec("$php -r \"$script\"", $output);
+var_dump(isset($output[0]));
+$loaded = $output[0] === "yes";
+$output = null;
+
+// Then we run the subprocess with com_dotnet loaded
+$script = <<<SCRIPT
 ini_set('com.autoregister_typelib', '1');
 new COM('WbemScripting.SWbemLocator');
 SCRIPT;
-$command = "$php -d extension_dir=$extension_dir -r \"$script\"";
+if ($loaded) {
+    $command = "$php -r \"$script\"";
+} else {
+    $extension_dir = escapeshellarg(ini_get("extension_dir"));
+    $command = "$php -d extension_dir=$extension_dir -d extension=com_dotnet -r \"$script\"";
+}
 exec($command, $output, $status);
 var_dump($output, $status);
 ?>
 --EXPECT--
+bool(true)
 array(0) {
 }
 int(0)