mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-30 06:55:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request from GHSA-c6fg-99pr-25m9

Browse Source
This commit is contained in:
Dylan T 2022-01-04 20:40:55 +00:00 committed by GitHub
parent 3ed57ce49a
commit 6492cac5c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/entity/Skin.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\entity; namespace pocketmine\entity;
use Ahc\Json\Comment as CommentedJsonDecoder; use Ahc\Json\Comment as CommentedJsonDecoder;
use pocketmine\utils\Limits;
use function implode; use function implode;
use function in_array; use function in_array;
use function json_encode; use function json_encode;
@ -48,7 +49,17 @@ final class Skin{
/** @var string */ /** @var string */
private $geometryData; private $geometryData;
private static function checkLength(string $string, string $name, int $maxLength) : void{
if(strlen($string) > $maxLength){
throw new InvalidSkinException("$name must be at most $maxLength bytes, but have " . strlen($string) . " bytes");
}
}
public function __construct(string $skinId, string $skinData, string $capeData = "", string $geometryName = "", string $geometryData = ""){ public function __construct(string $skinId, string $skinData, string $capeData = "", string $geometryName = "", string $geometryData = ""){
self::checkLength($skinId, "Skin ID", Limits::INT16_MAX);
self::checkLength($geometryName, "Geometry name", Limits::INT16_MAX);
self::checkLength($geometryData, "Geometry data", Limits::INT32_MAX);
if($skinId === ""){ if($skinId === ""){
throw new InvalidSkinException("Skin ID must not be empty"); throw new InvalidSkinException("Skin ID must not be empty");
} }