php_formatted_print() throws on failure

cmb69 · cmb69 · commit 45b638afe031 · 2020-12-27T22:40:25.000+01:00
Closes GH-6542.
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
@@ -770,7 +770,7 @@ PHP_FUNCTION(sprintf)
 
 	result = php_formatted_print(format, format_len, args, argc, 1);
 	if (result == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 	RETVAL_STR(result);
 }
@@ -796,7 +796,7 @@ PHP_FUNCTION(vsprintf)
 	result = php_formatted_print(format, format_len, args, argc, -1);
 	efree(args);
 	if (result == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 	RETVAL_STR(result);
 }
@@ -819,7 +819,7 @@ PHP_FUNCTION(printf)
 
 	result = php_formatted_print(format, format_len, args, argc, 1);
 	if (result == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 	rlen = PHPWRITE(ZSTR_VAL(result), ZSTR_LEN(result));
 	zend_string_efree(result);
@@ -848,7 +848,7 @@ PHP_FUNCTION(vprintf)
 	result = php_formatted_print(format, format_len, args, argc, -1);
 	efree(args);
 	if (result == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 	rlen = PHPWRITE(ZSTR_VAL(result), ZSTR_LEN(result));
 	zend_string_efree(result);
@@ -876,7 +876,7 @@ PHP_FUNCTION(fprintf)
 
 	result = php_formatted_print(format, format_len, args, argc, 2);
 	if (result == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	php_stream_write(stream, ZSTR_VAL(result), ZSTR_LEN(result));
@@ -910,7 +910,7 @@ PHP_FUNCTION(vfprintf)
 	result = php_formatted_print(format, format_len, args, argc, -1);
 	efree(args);
 	if (result == NULL) {
-		return;
+		RETURN_THROWS();
 	}
 
 	php_stream_write(stream, ZSTR_VAL(result), ZSTR_LEN(result));

Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,7 @@ PHP_FUNCTION(sprintf)`
`770`	`770`
`771`	`771`	`result = php_formatted_print(format, format_len, args, argc, 1);`
`772`	`772`	`if (result == NULL) {`
`773`		`- return;`
	`773`	`+ RETURN_THROWS();`
`774`	`774`	`}`
`775`	`775`	`RETVAL_STR(result);`
`776`	`776`	`}`
`@@ -796,7 +796,7 @@ PHP_FUNCTION(vsprintf)`
`796`	`796`	`result = php_formatted_print(format, format_len, args, argc, -1);`
`797`	`797`	`efree(args);`
`798`	`798`	`if (result == NULL) {`
`799`		`- return;`
	`799`	`+ RETURN_THROWS();`
`800`	`800`	`}`
`801`	`801`	`RETVAL_STR(result);`
`802`	`802`	`}`
`@@ -819,7 +819,7 @@ PHP_FUNCTION(printf)`
`819`	`819`
`820`	`820`	`result = php_formatted_print(format, format_len, args, argc, 1);`
`821`	`821`	`if (result == NULL) {`
`822`		`- return;`
	`822`	`+ RETURN_THROWS();`
`823`	`823`	`}`
`824`	`824`	`rlen = PHPWRITE(ZSTR_VAL(result), ZSTR_LEN(result));`
`825`	`825`	`zend_string_efree(result);`
`@@ -848,7 +848,7 @@ PHP_FUNCTION(vprintf)`
`848`	`848`	`result = php_formatted_print(format, format_len, args, argc, -1);`
`849`	`849`	`efree(args);`
`850`	`850`	`if (result == NULL) {`
`851`		`- return;`
	`851`	`+ RETURN_THROWS();`
`852`	`852`	`}`
`853`	`853`	`rlen = PHPWRITE(ZSTR_VAL(result), ZSTR_LEN(result));`
`854`	`854`	`zend_string_efree(result);`
`@@ -876,7 +876,7 @@ PHP_FUNCTION(fprintf)`
`876`	`876`
`877`	`877`	`result = php_formatted_print(format, format_len, args, argc, 2);`
`878`	`878`	`if (result == NULL) {`
`879`		`- return;`
	`879`	`+ RETURN_THROWS();`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`php_stream_write(stream, ZSTR_VAL(result), ZSTR_LEN(result));`
`@@ -910,7 +910,7 @@ PHP_FUNCTION(vfprintf)`
`910`	`910`	`result = php_formatted_print(format, format_len, args, argc, -1);`
`911`	`911`	`efree(args);`
`912`	`912`	`if (result == NULL) {`
`913`		`- return;`
	`913`	`+ RETURN_THROWS();`
`914`	`914`	`}`
`915`	`915`
`916`	`916`	`php_stream_write(stream, ZSTR_VAL(result), ZSTR_LEN(result));`