Fix fix for bug #79877 for PHP 8

cmb69 · cmb69 · commit b9171d8a9354 · 2020-08-03T12:01:56.000+02:00
PHP 8 is supposed to throw here.
diff --git a/ext/standard/image.c b/ext/standard/image.c
@@ -1476,8 +1476,8 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (mode == FROM_PATH && CHECK_NULL_PATH(input, input_len)) {
-		php_error_docref(NULL, E_WARNING, "Invalid path");
-		return;
+		zend_argument_type_error(1, "must not contain any null bytes");
+		RETURN_THROWS();
 	}
 
 	if (argc == 2) {
diff --git a/ext/standard/tests/image/bug79877.phpt b/ext/standard/tests/image/bug79877.phpt
@@ -5,5 +5,6 @@ Bug #79877 (getimagesize function silently truncates after a null byte)
 var_dump(getimagesize("/tmp/a.png\0xx"));
 ?>
 --EXPECTF--
-Warning: getimagesize(): Invalid path in %s on line %d
-NULL
+Fatal error: Uncaught TypeError: getimagesize(): Argument #1 ($image_path) must not contain any null bytes in %s:%d
+Stack trace:
+%a

Original file line number	Diff line number	Diff line change
`@@ -1476,8 +1476,8 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) {`
`1476`	`1476`	`ZEND_PARSE_PARAMETERS_END();`
`1477`	`1477`
`1478`	`1478`	`if (mode == FROM_PATH && CHECK_NULL_PATH(input, input_len)) {`
`1479`		`- php_error_docref(NULL, E_WARNING, "Invalid path");`
`1480`		`- return;`
	`1479`	`+ zend_argument_type_error(1, "must not contain any null bytes");`
	`1480`	`+ RETURN_THROWS();`
`1481`	`1481`	`}`
`1482`	`1482`
`1483`	`1483`	`if (argc == 2) {`