Use ZEND_THROWS() where applicable in spl_array.c

Girgias · Girgias · commit 2fa33d1defca · 2022-03-23T22:13:08.000Z
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
@@ -1574,7 +1574,7 @@ PHP_METHOD(ArrayObject, unserialize)
 
 	if (intern->nApplyCount > 0) {
 		zend_throw_error(NULL, "Modification of ArrayObject during sorting is prohibited");
-		return;
+		RETURN_THROWS();
 	}
 
 	/* storage */
@@ -1773,7 +1773,7 @@ PHP_METHOD(ArrayObject, __unserialize)
 PHP_METHOD(ArrayObject, __debugInfo)
 {
 	if (zend_parse_parameters_none() == FAILURE) {
-		return;
+		RETURN_THROWS();
 	}
 
 	RETURN_ARR(spl_array_get_debug_info(Z_OBJ_P(ZEND_THIS)));

Original file line number	Diff line number	Diff line change
`@@ -1574,7 +1574,7 @@ PHP_METHOD(ArrayObject, unserialize)`
`1574`	`1574`
`1575`	`1575`	`if (intern->nApplyCount > 0) {`
`1576`	`1576`	`zend_throw_error(NULL, "Modification of ArrayObject during sorting is prohibited");`
`1577`		`- return;`
	`1577`	`+ RETURN_THROWS();`
`1578`	`1578`	`}`
`1579`	`1579`
`1580`	`1580`	`/* storage */`
`@@ -1773,7 +1773,7 @@ PHP_METHOD(ArrayObject, __unserialize)`
`1773`	`1773`	`PHP_METHOD(ArrayObject, __debugInfo)`
`1774`	`1774`	`{`
`1775`	`1775`	`if (zend_parse_parameters_none() == FAILURE) {`
`1776`		`- return;`
	`1776`	`+ RETURN_THROWS();`
`1777`	`1777`	`}`
`1778`	`1778`
`1779`	`1779`	`RETURN_ARR(spl_array_get_debug_info(Z_OBJ_P(ZEND_THIS)));`