mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 16:59:44 +00:00
Code Issues Projects Releases Wiki Activity

LegacySkinAdapter: check return value of json_encode() for resource patch

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-10-08 21:42:07 +01:00
parent b0b08d45d5
commit 15a2fd6e4f
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/network/mcpe/convert/LegacySkinAdapter.php
View File

@ -31,6 +31,7 @@ use function is_array;
use function is_string; use function is_string;
use function json_decode; use function json_decode;
use function json_encode; use function json_encode;
use function json_last_error_msg;
use function random_bytes; use function random_bytes;
use function str_repeat; use function str_repeat;
@ -43,9 +44,13 @@ class LegacySkinAdapter implements SkinAdapter{
if($geometryName === ""){ if($geometryName === ""){
$geometryName = "geometry.humanoid.custom"; $geometryName = "geometry.humanoid.custom";
} }
$resourcePatch = json_encode(["geometry" => ["default" => $geometryName]]);
if($resourcePatch === false){
throw new \RuntimeException("json_encode() failed: " . json_last_error_msg());
}
return new SkinData( return new SkinData(
$skin->getSkinId(), $skin->getSkinId(),
json_encode(["geometry" => ["default" => $geometryName]]), $resourcePatch,
SkinImage::fromLegacy($skin->getSkinData()), [], SkinImage::fromLegacy($skin->getSkinData()), [],
$capeImage, $capeImage,
$skin->getGeometryData() $skin->getGeometryData()