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

add some limits on batches

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-04-21 14:15:38 +01:00
parent 2ef3962028
commit 76c234e4e6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/network/mcpe/protocol/BatchPacket.php
View File

@ -61,7 +61,7 @@ class BatchPacket extends DataPacket{
protected function decodePayload(){ protected function decodePayload(){
$data = $this->getRemaining(); $data = $this->getRemaining();
try{ try{
$this->payload = zlib_decode($data, 1024 * 1024 * 64); //Max 64MB $this->payload = zlib_decode($data, 1024 * 1024 * 2); //Max 64MB
}catch(\ErrorException $e){ //zlib decode error }catch(\ErrorException $e){ //zlib decode error
$this->payload = ""; $this->payload = "";
} }
@ -94,7 +94,11 @@ class BatchPacket extends DataPacket{
*/ */
public function getPackets(){ public function getPackets(){
$stream = new NetworkBinaryStream($this->payload); $stream = new NetworkBinaryStream($this->payload);
$count = 0;
while(!$stream->feof()){ while(!$stream->feof()){
if($count++ >= 500){
throw new \UnexpectedValueException("Too many packets in a single batch");
}
yield $stream->getString(); yield $stream->getString();
} }
} }