Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix GH-17408: Assertion failure Zend/zend_exceptions.c
php · Jan 21, 2025 · 25543b4 · 25543b4
2 parents b3c297d + 5344bcc
commit 25543b4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -16,6 +16,8 @@ PHP                                                                        NEWS
   . Fixed NULL arithmetic during system program execution on Windows. (cmb,
     nielsdos)
   . Fixed potential OOB when checking for trailing spaces on Windows. (cmb)
+  . Fixed bug GH-17408 (Assertion failure Zend/zend_exceptions.c).
+    (nielsdos, ilutov)
 
 - DOM:
   . Fixed bug GH-17397 (Assertion failure ext/dom/php_dom.c). (nielsdos)

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