mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-04-21 16:56:53 +01:00
parent 86cc151e60 db896b9faf
commit 0dac982f16
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/network/mcpe/NetworkCompression.php
View File

@ -37,12 +37,13 @@ final class NetworkCompression{
/**
* @param string $payload
* @param int $maxDecodedLength default 2MB
*
* @return string
* @throws \ErrorException
*/
public static function decompress(string $payload) : string{
return zlib_decode($payload, 1024 * 1024 * 64); //Max 64MB
public static function decompress(string $payload, int $maxDecodedLength = 1024 * 1024 * 2) : string{
return zlib_decode($payload, $maxDecodedLength);
}
/**

4
src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -260,7 +260,11 @@ class NetworkSession{
Timings::$playerNetworkReceiveDecompressTimer->stopTiming();
}
$count = 0;
while(!$stream->feof() and $this->connected){
if($count++ >= 500){
throw new BadPacketException("Too many packets in a single batch");
}
try{
$pk = PacketPool::getPacket($stream->getString());
}catch(BinaryDataException $e){