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

ResourcePacksSessionHandler: Account for out-of-bounds chunk requests

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-21 14:19:24 +01:00
parent b9cd96f6e0
commit d6e61e3e00
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/network/mcpe/handler/ResourcePacksSessionHandler.php
View File

@ -113,11 +113,19 @@ class ResourcePacksSessionHandler extends SessionHandler{
return false; return false;
} }
$offset = $packet->chunkIndex * self::PACK_CHUNK_SIZE;
if($offset < 0 or $offset >= $pack->getPackSize()){
$this->player->close("", "disconnectionScreen.resourcePack", true);
$this->player->getServer()->getLogger()->debug("Got a resource pack chunk request with invalid start offset $offset, file size is " . $pack->getPackSize());
return false;
}
$pk = new ResourcePackChunkDataPacket(); $pk = new ResourcePackChunkDataPacket();
$pk->packId = $pack->getPackId(); $pk->packId = $pack->getPackId();
$pk->chunkIndex = $packet->chunkIndex; $pk->chunkIndex = $packet->chunkIndex;
$pk->data = $pack->getPackChunk(self::PACK_CHUNK_SIZE * $packet->chunkIndex, self::PACK_CHUNK_SIZE); $pk->data = $pack->getPackChunk($offset, self::PACK_CHUNK_SIZE);
$pk->progress = self::PACK_CHUNK_SIZE * $packet->chunkIndex; $pk->progress = $offset;
$this->session->sendDataPacket($pk); $this->session->sendDataPacket($pk);
return true; return true;