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

Merge branch '3.7'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-30 19:19:02 +00:00
commit aff2e0c86c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/network/mcpe/NetworkBinaryStream.php
View File

@ -105,7 +105,7 @@ 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)->getTag(); $compound = (new NetworkNbtSerializer())->read($this->buffer, $this->offset, 512)->getTag();
}elseif($nbtLen !== 0){ }elseif($nbtLen !== 0){
throw new BadPacketException("Unexpected fake NBT length $nbtLen"); throw new BadPacketException("Unexpected fake NBT length $nbtLen");
} }

3
src/pocketmine/network/mcpe/handler/SimpleSessionHandler.php
View File

@ -436,7 +436,8 @@ class SimpleSessionHandler extends SessionHandler{
$block = $this->player->getLevel()->getBlock($pos); $block = $this->player->getLevel()->getBlock($pos);
try{ try{
$nbt = (new NetworkNbtSerializer())->read($packet->namedtag)->getTag(); $offset = 0;
$nbt = (new NetworkNbtSerializer())->read($packet->namedtag, $offset, 512)->getTag();
}catch(NbtDataException $e){ }catch(NbtDataException $e){
throw new BadPacketException($e->getMessage(), 0, $e); throw new BadPacketException($e->getMessage(), 0, $e);
} }