make sure we lift exceptions up the call stack

mattdinthehouse · mattdinthehouse · commit a3d645040175 · 2025-08-14T23:07:47.000+10:00
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -5161,7 +5161,7 @@ ZEND_METHOD(ReflectionClass, newInstanceFromData)
 	}
 
 	if (UNEXPECTED(object_init_ex(return_value, ce) != SUCCESS)) {
-		return;
+		RETURN_THROWS();
 	}
 
 	ZEND_HASH_FOREACH_STR_KEY_VAL(data, key, val) {
@@ -5186,9 +5186,11 @@ ZEND_METHOD(ReflectionClass, newInstanceFromData)
 
 		if (EG(exception)) {
 			zend_object_store_ctor_failed(Z_OBJ_P(return_value));
+			RETURN_THROWS();
 		}
 	} else if (argc) {
 		zend_throw_exception_ex(reflection_exception_ptr, 0, "Class %s does not have a constructor, so you cannot pass any constructor arguments", ZSTR_VAL(ce->name));
+		RETURN_THROWS();
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -5161,7 +5161,7 @@ ZEND_METHOD(ReflectionClass, newInstanceFromData)`
`5161`	`5161`	`}`
`5162`	`5162`
`5163`	`5163`	`if (UNEXPECTED(object_init_ex(return_value, ce) != SUCCESS)) {`
`5164`		`- return;`
	`5164`	`+ RETURN_THROWS();`
`5165`	`5165`	`}`
`5166`	`5166`
`5167`	`5167`	`ZEND_HASH_FOREACH_STR_KEY_VAL(data, key, val) {`
`@@ -5186,9 +5186,11 @@ ZEND_METHOD(ReflectionClass, newInstanceFromData)`
`5186`	`5186`
`5187`	`5187`	`if (EG(exception)) {`
`5188`	`5188`	`zend_object_store_ctor_failed(Z_OBJ_P(return_value));`
	`5189`	`+ RETURN_THROWS();`
`5189`	`5190`	`}`
`5190`	`5191`	`} else if (argc) {`
`5191`	`5192`	`zend_throw_exception_ex(reflection_exception_ptr, 0, "Class %s does not have a constructor, so you cannot pass any constructor arguments", ZSTR_VAL(ce->name));`
	`5193`	`+ RETURN_THROWS();`
`5192`	`5194`	`}`
`5193`	`5195`	`}`
`5194`	`5196`	`/* }}} */`