Merge branch 'PHP-8.0'

* PHP-8.0:
  Don't throw from imagecreatefromstring() with too short string

Author: nikic

ext/gd/gd.c

@@ -1531,8 +1531,9 @@ PHP_FUNCTION(imagecreatefromstring)
 	}
 
 	if (ZSTR_LEN(data) < sizeof(sig)) {
-		zend_argument_value_error(1, "cannot be empty");
-		RETURN_THROWS();
+		/* Handle this the same way as an unknown image type. */
+		php_error_docref(NULL, E_WARNING, "Data is not in a recognized format");
+		RETURN_FALSE;
 	}
 
 	memcpy(sig, ZSTR_VAL(data), sizeof(sig));

ext/gd/tests/createfromstring.phpt

@@ -62,6 +62,7 @@ $im = imagecreatefromstring(' asdf jklp foo');
 --EXPECTF--
 createfromstring truecolor png: ok
 createfromstring palette png: ok
-imagecreatefromstring(): Argument #1 ($data) cannot be empty
 
-Warning: imagecreatefromstring(): Data is not in a recognized format in %screatefromstring.php on line %d
+Warning: imagecreatefromstring(): Data is not in a recognized format in %s on line %d
+
+Warning: imagecreatefromstring(): Data is not in a recognized format in %s on line %d