mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Detect really big corrupted chunks, closes #2471

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-12-31 12:40:11 +01:00
parent 767800662c
commit 95b305ce87
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/level/format/anvil/RegionLoader.php
View File

@ -88,6 +88,12 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
$compression = ord(fgetc($this->filePointer)); $compression = ord(fgetc($this->filePointer));
} }
if($length >= self::MAX_SECTOR_LENGTH){
MainLogger::getLogger()->error("Corrupted chunk header detected");
return false;
}
if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors
MainLogger::getLogger()->error("Corrupted chunk detected"); MainLogger::getLogger()->error("Corrupted chunk detected");
$this->locationTable[$index][1] = $length >> 12; $this->locationTable[$index][1] = $length >> 12;

7
src/pocketmine/level/format/mcregion/RegionLoader.php
View File

@ -38,6 +38,7 @@ class RegionLoader{
const VERSION = 1; const VERSION = 1;
const COMPRESSION_GZIP = 1; const COMPRESSION_GZIP = 1;
const COMPRESSION_ZLIB = 2; const COMPRESSION_ZLIB = 2;
const MAX_SECTOR_LENGTH = 32 << 12; //32 sectors
public static $COMPRESSION_LEVEL = 7; public static $COMPRESSION_LEVEL = 7;
protected $x; protected $x;
@ -109,6 +110,12 @@ class RegionLoader{
$compression = ord(fgetc($this->filePointer)); $compression = ord(fgetc($this->filePointer));
} }
if($length >= self::MAX_SECTOR_LENGTH){
MainLogger::getLogger()->error("Corrupted chunk header detected");
return false;
}
if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors
MainLogger::getLogger()->error("Corrupted bigger chunk detected"); MainLogger::getLogger()->error("Corrupted bigger chunk detected");
$this->locationTable[$index][1] = $length >> 12; $this->locationTable[$index][1] = $length >> 12;