mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 17:29:44 +00:00
Code Issues Projects Releases Wiki Activity

Catch more coruption issues in Region-based worlds, fixed first chunk being generated on an invalid sector

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-01-06 00:11:38 +01:00
parent 53f2f21f2d
commit efe75f2836
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
2 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,10 +34,6 @@ use pocketmine\utils\Binary;
use pocketmine\utils\MainLogger; use pocketmine\utils\MainLogger;
class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
const VERSION = 1;
const COMPRESSION_GZIP = 1;
const COMPRESSION_ZLIB = 2;
public static $COMPRESSION_LEVEL = 7;
public function __construct(LevelProvider $level, $regionX, $regionZ){ public function __construct(LevelProvider $level, $regionX, $regionZ){
$this->x = $regionX; $this->x = $regionX;
@ -61,7 +57,7 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
if($index < 0 or $index >= 4096){ if($index < 0 or $index >= 4096){
//Regenerate chunk due to corruption //Regenerate chunk due to corruption
$this->locationTable[$index][0] = 0; $this->locationTable[$index][0] = 0;
$this->locationTable[$index][1] = 1; $this->locationTable[$index][1] = 0;
} }
if(!$this->isChunkGenerated($index)){ if(!$this->isChunkGenerated($index)){
@ -73,7 +69,7 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
fwrite($this->filePointer, str_pad(Binary::writeInt(-1) . chr(self::COMPRESSION_ZLIB), 4096, "\x00", STR_PAD_RIGHT)); fwrite($this->filePointer, str_pad(Binary::writeInt(-1) . chr(self::COMPRESSION_ZLIB), 4096, "\x00", STR_PAD_RIGHT));
$this->writeLocationIndex($index); $this->writeLocationIndex($index);
}else{ }else{
return false; return null;
} }
} }
@ -81,27 +77,26 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
$length = Binary::readInt(fread($this->filePointer, 4)); $length = Binary::readInt(fread($this->filePointer, 4));
$compression = ord(fgetc($this->filePointer)); $compression = ord(fgetc($this->filePointer));
if($length <= 0){ //Not yet generated if($length <= 0 or $length >= self::MAX_SECTOR_LENGTH){ //Not yet generated / corrupted
if($length >= self::MAX_SECTOR_LENGTH){
$this->locationTable[$index][0] = ++$this->lastSector;
$this->locationTable[$index][1] = 1;
MainLogger::getLogger()->error("Corrupted chunk header detected");
}
$this->generateChunk($x, $z); $this->generateChunk($x, $z);
fseek($this->filePointer, $this->locationTable[$index][0] << 12); fseek($this->filePointer, $this->locationTable[$index][0] << 12);
$length = Binary::readInt(fread($this->filePointer, 4)); $length = Binary::readInt(fread($this->filePointer, 4));
$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 bigger chunk detected");
$this->locationTable[$index][1] = $length >> 12; $this->locationTable[$index][1] = $length >> 12;
$this->writeLocationIndex($index); $this->writeLocationIndex($index);
}elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){ }elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
MainLogger::getLogger()->error("Invalid compression type"); MainLogger::getLogger()->error("Invalid compression type");
return false; return null;
} }
$chunk = Chunk::fromBinary(fread($this->filePointer, $length - 1), $this->levelProvider); $chunk = Chunk::fromBinary(fread($this->filePointer, $length - 1), $this->levelProvider);

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

@ -38,7 +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 const MAX_SECTOR_LENGTH = 256 << 12; //256 sectors, (1 MiB)
public static $COMPRESSION_LEVEL = 7; public static $COMPRESSION_LEVEL = 7;
protected $x; protected $x;
@ -83,7 +83,7 @@ class RegionLoader{
if($index < 0 or $index >= 4096){ if($index < 0 or $index >= 4096){
//Regenerate chunk due to corruption //Regenerate chunk due to corruption
$this->locationTable[$index][0] = 0; $this->locationTable[$index][0] = 0;
$this->locationTable[$index][1] = 1; $this->locationTable[$index][1] = 0;
} }
if(!$this->isChunkGenerated($index)){ if(!$this->isChunkGenerated($index)){
@ -95,7 +95,7 @@ class RegionLoader{
fwrite($this->filePointer, str_pad(Binary::writeInt(-1) . chr(self::COMPRESSION_ZLIB), 4096, "\x00", STR_PAD_RIGHT)); fwrite($this->filePointer, str_pad(Binary::writeInt(-1) . chr(self::COMPRESSION_ZLIB), 4096, "\x00", STR_PAD_RIGHT));
$this->writeLocationIndex($index); $this->writeLocationIndex($index);
}else{ }else{
return false; return null;
} }
} }
@ -103,19 +103,18 @@ class RegionLoader{
$length = Binary::readInt(fread($this->filePointer, 4)); $length = Binary::readInt(fread($this->filePointer, 4));
$compression = ord(fgetc($this->filePointer)); $compression = ord(fgetc($this->filePointer));
if($length <= 0){ //Not yet generated if($length <= 0 or $length >= self::MAX_SECTOR_LENGTH){ //Not yet generated / corrupted
if($length >= self::MAX_SECTOR_LENGTH){
$this->locationTable[$index][0] = ++$this->lastSector;
$this->locationTable[$index][1] = 1;
MainLogger::getLogger()->error("Corrupted chunk header detected");
}
$this->generateChunk($x, $z); $this->generateChunk($x, $z);
fseek($this->filePointer, $this->locationTable[$index][0] << 12); fseek($this->filePointer, $this->locationTable[$index][0] << 12);
$length = Binary::readInt(fread($this->filePointer, 4)); $length = Binary::readInt(fread($this->filePointer, 4));
$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;
@ -123,7 +122,7 @@ class RegionLoader{
}elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){ }elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
MainLogger::getLogger()->error("Invalid compression type"); MainLogger::getLogger()->error("Invalid compression type");
return false; return null;
} }
$chunk = Chunk::fromBinary(fread($this->filePointer, $length - 1), $this->levelProvider); $chunk = Chunk::fromBinary(fread($this->filePointer, $length - 1), $this->levelProvider);
@ -180,7 +179,7 @@ class RegionLoader{
$sectors = (int) ceil(($length + 4) / 4096); $sectors = (int) ceil(($length + 4) / 4096);
$index = self::getChunkOffset($x, $z); $index = self::getChunkOffset($x, $z);
if($this->locationTable[$index][1] < $sectors){ if($this->locationTable[$index][1] < $sectors){
$this->locationTable[$index][0] = $this->lastSector += $sectors; //The GC will clean this shift later $this->locationTable[$index][0] = $this->lastSector += $sectors; //The GC will clean this shift "later"
} }
$this->locationTable[$index][1] = $sectors; $this->locationTable[$index][1] = $sectors;
@ -285,7 +284,7 @@ class RegionLoader{
protected function loadLocationTable(){ protected function loadLocationTable(){
fseek($this->filePointer, 0); fseek($this->filePointer, 0);
$this->lastSector = 1; $this->lastSector = 2;
$table = fread($this->filePointer, 4 * 1024 * 2); $table = fread($this->filePointer, 4 * 1024 * 2);
for($i = 0; $i < 1024; ++$i){ for($i = 0; $i < 1024; ++$i){
$index = unpack("N", substr($table, $i << 2, 4))[1]; $index = unpack("N", substr($table, $i << 2, 4))[1];
@ -300,7 +299,7 @@ class RegionLoader{
$write = []; $write = [];
for($i = 0; $i < 1024; ++$i){ for($i = 0; $i < 1024; ++$i){
$write[] = ($this->locationTable[$i][0] << 8) | $this->locationTable[$i][1]; $write[] = (($this->locationTable[$i][0] << 8) | $this->locationTable[$i][1]);
} }
for($i = 0; $i < 1024; ++$i){ for($i = 0; $i < 1024; ++$i){
$write[] = $this->locationTable[$i][2]; $write[] = $this->locationTable[$i][2];