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

Throw exceptions when failing to deserialize item NBT data, fixed weird crashes when an invalid NBT tag is set on an item

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-03-29 13:35:53 +01:00
parent 1c3d89cfef
commit bc1c75a15a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/item/Item.php
View File

@ -46,12 +46,22 @@ class Item implements ItemIds, \JsonSerializable{
private static $cachedParser = null; private static $cachedParser = null;
private static function parseCompoundTag(string $tag) : CompoundTag{ private static function parseCompoundTag(string $tag) : CompoundTag{
if(strlen($tag) === 0){
throw new \InvalidArgumentException("No NBT data found in supplied string");
}
if(self::$cachedParser === null){ if(self::$cachedParser === null){
self::$cachedParser = new NBT(NBT::LITTLE_ENDIAN); self::$cachedParser = new NBT(NBT::LITTLE_ENDIAN);
} }
self::$cachedParser->read($tag); self::$cachedParser->read($tag);
return self::$cachedParser->getData(); $data = self::$cachedParser->getData();
if(!($data instanceof CompoundTag)){
throw new \InvalidArgumentException("Invalid item NBT string given, it could not be deserialized");
}
return $data;
} }
private static function writeCompoundTag(CompoundTag $tag) : string{ private static function writeCompoundTag(CompoundTag $tag) : string{