mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 01:39:52 +00:00
Code Issues Projects Releases Wiki Activity

fix crash on invalid NBT during itemstack decoding

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-05-30 09:53:20 +01:00
parent 3d8cd54f16
commit ece4d99c1e
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/network/mcpe/NetworkBinaryStream.php
View File

@ -31,6 +31,7 @@ use pocketmine\item\ItemFactory;
use pocketmine\item\ItemIds; use pocketmine\item\ItemIds;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\NbtDataException;
use pocketmine\nbt\TreeRoot; use pocketmine\nbt\TreeRoot;
use pocketmine\network\BadPacketException; use pocketmine\network\BadPacketException;
use pocketmine\network\mcpe\protocol\types\CommandOriginData; use pocketmine\network\mcpe\protocol\types\CommandOriginData;
@ -105,7 +106,11 @@ class NetworkBinaryStream extends BinaryStream{
if($c !== 1){ if($c !== 1){
throw new BadPacketException("Unexpected NBT count $c"); throw new BadPacketException("Unexpected NBT count $c");
} }
$compound = (new NetworkNbtSerializer())->read($this->buffer, $this->offset, 512)->getTag(); try{
$compound = (new NetworkNbtSerializer())->read($this->buffer, $this->offset, 512)->getTag();
}catch(NbtDataException $e){
throw new BadPacketException($e->getMessage(), 0, $e);
}
}elseif($nbtLen !== 0){ }elseif($nbtLen !== 0){
throw new BadPacketException("Unexpected fake NBT length $nbtLen"); throw new BadPacketException("Unexpected fake NBT length $nbtLen");
} }