Merge branch 'PHP-8.4'

* PHP-8.4: Fix GH-17408: Assertion failure Zend/zend_exceptions.c
php · Jan 21, 2025 · 3786b72 · 3786b72
2 parents 0f8340d + 25543b4
commit 3786b72
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -194,7 +194,6 @@ ZEND_API ZEND_COLD void zend_throw_exception_internal(zend_object *exception) /*
 		zend_exception_set_previous(exception, EG(exception));
 		EG(exception) = exception;
 		if (previous) {
-			ZEND_ASSERT(is_handle_exception_set() && "HANDLE_EXCEPTION not set?");
 			return;
 		}
 	}

diff --git a/ext/zend_test/tests/gh17408.phpt b/ext/zend_test/tests/gh17408.phpt
@@ -0,0 +1,22 @@
+--TEST--
+GH-17408 (Assertion failure Zend/zend_exceptions.c)
+--EXTENSIONS--
+zend_test
+--FILE--
+<?php
+function test() {
+    $resource = zend_test_create_throwing_resource();
+    zend_test_create_throwing_resource();
+}
+test();
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception: Throwing resource destructor called in %s:%d
+Stack trace:
+#0 %s(%d): test()
+#1 {main}
+
+Next Exception: Throwing resource destructor called in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d