mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-04 09:10:00 +00:00
Code Issues Projects Releases Wiki Activity

UUID: properly account for garbage inputs which aren't valid hexadecimal

Browse Source 
this would previously throw a TypeError and crash.
This commit is contained in:
Dylan K. Taylor 2020-04-15 09:44:14 +01:00
parent e3ebf8bb61
commit ccad97727f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/utils/UUID.php
View File

@ -61,7 +61,12 @@ class UUID{
* Creates an UUID from an hexadecimal representation * Creates an UUID from an hexadecimal representation
*/ */
public static function fromString(string $uuid, int $version = null) : UUID{ public static function fromString(string $uuid, int $version = null) : UUID{
return self::fromBinary(hex2bin(str_replace("-", "", trim($uuid))), $version); //TODO: should we be stricter about the notation (8-4-4-4-12)?
$binary = @hex2bin(str_replace("-", "", trim($uuid)));
if($binary === false){
throw new \InvalidArgumentException("Invalid hex string UUID representation");
}
return self::fromBinary($binary, $version);
} }
/** /**