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

world IO: fixed crashes when garbage data found in tile/entity NBT data

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-12-12 18:21:23 +00:00
parent 9a4b72add5
commit 37a8d95464
3 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\level\format\io\leveldb;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\io\BaseLevelProvider; use pocketmine\level\format\io\BaseLevelProvider;
use pocketmine\level\format\io\ChunkUtils; use pocketmine\level\format\io\ChunkUtils;
use pocketmine\level\format\io\exception\CorruptedChunkException;
use pocketmine\level\format\io\exception\UnsupportedChunkFormatException; use pocketmine\level\format\io\exception\UnsupportedChunkFormatException;
use pocketmine\level\format\SubChunk; use pocketmine\level\format\SubChunk;
use pocketmine\level\generator\Flat; use pocketmine\level\generator\Flat;
@ -414,24 +415,27 @@ class LevelDB extends BaseLevelProvider{
/** @var CompoundTag[] $entities */ /** @var CompoundTag[] $entities */
$entities = []; $entities = [];
if(($entityData = $this->db->get($index . self::TAG_ENTITY)) !== false and $entityData !== ""){ if(($entityData = $this->db->get($index . self::TAG_ENTITY)) !== false and $entityData !== ""){
$entities = $nbt->read($entityData, true); $entityTags = $nbt->read($entityData, true);
if(!is_array($entities)){ foreach((is_array($entityTags) ? $entityTags : [$entityTags]) as $entityTag){
$entities = [$entities]; if(!($entityTag instanceof CompoundTag)){
} throw new CorruptedChunkException("Entity root tag should be TAG_Compound");
} }
if($entityTag->hasTag("id", IntTag::class)){
/** @var CompoundTag $entityNBT */ $entityTag->setInt("id", $entityTag->getInt("id") & 0xff); //remove type flags - TODO: use these instead of removing them)
foreach($entities as $entityNBT){ }
if($entityNBT->hasTag("id", IntTag::class)){ $entities[] = $entityTag;
$entityNBT->setInt("id", $entityNBT->getInt("id") & 0xff); //remove type flags - TODO: use these instead of removing them)
} }
} }
/** @var CompoundTag[] $tiles */
$tiles = []; $tiles = [];
if(($tileData = $this->db->get($index . self::TAG_BLOCK_ENTITY)) !== false and $tileData !== ""){ if(($tileData = $this->db->get($index . self::TAG_BLOCK_ENTITY)) !== false and $tileData !== ""){
$tiles = $nbt->read($tileData, true); $tileTags = $nbt->read($tileData, true);
if(!is_array($tiles)){ foreach((is_array($tileTags) ? $tileTags : [$tileTags]) as $tileTag){
$tiles = [$tiles]; if(!($tileTag instanceof CompoundTag)){
throw new CorruptedChunkException("Tile root tag should be TAG_Compound");
}
$tiles[] = $tileTag;
} }
} }

4
src/pocketmine/level/format/io/region/Anvil.php
View File

@ -122,8 +122,8 @@ class Anvil extends McRegion{
$chunk->getInt("xPos"), $chunk->getInt("xPos"),
$chunk->getInt("zPos"), $chunk->getInt("zPos"),
$subChunks, $subChunks,
$chunk->hasTag("Entities", ListTag::class) ? $chunk->getListTag("Entities")->getValue() : [], $chunk->hasTag("Entities", ListTag::class) ? self::getCompoundList("Entities", $chunk->getListTag("Entities")) : [],
$chunk->hasTag("TileEntities", ListTag::class) ? $chunk->getListTag("TileEntities")->getValue() : [], $chunk->hasTag("TileEntities", ListTag::class) ? self::getCompoundList("TileEntities", $chunk->getListTag("TileEntities")) : [],
$biomeIds, $biomeIds,
$chunk->getIntArray("HeightMap", []) $chunk->getIntArray("HeightMap", [])
); );

29
src/pocketmine/level/format/io/region/McRegion.php
View File

@ -194,8 +194,8 @@ class McRegion extends BaseLevelProvider{
$chunk->getInt("xPos"), $chunk->getInt("xPos"),
$chunk->getInt("zPos"), $chunk->getInt("zPos"),
$subChunks, $subChunks,
$chunk->hasTag("Entities", ListTag::class) ? $chunk->getListTag("Entities")->getValue() : [], $chunk->hasTag("Entities", ListTag::class) ? self::getCompoundList("Entities", $chunk->getListTag("Entities")) : [],
$chunk->hasTag("TileEntities", ListTag::class) ? $chunk->getListTag("TileEntities")->getValue() : [], $chunk->hasTag("TileEntities", ListTag::class) ? self::getCompoundList("TileEntities", $chunk->getListTag("TileEntities")) : [],
$biomeIds, $biomeIds,
$heightMap $heightMap
); );
@ -205,6 +205,31 @@ class McRegion extends BaseLevelProvider{
return $result; return $result;
} }
/**
* @param string $context
* @param ListTag $list
*
* @return CompoundTag[]
* @throws CorruptedChunkException
*/
protected static function getCompoundList(string $context, ListTag $list) : array{
if($list->count() === 0){ //empty lists might have wrong types, we don't care
return [];
}
if($list->getTagType() !== NBT::TAG_Compound){
throw new CorruptedChunkException("Expected TAG_List<TAG_Compound> for '$context'");
}
$result = [];
foreach($list as $tag){
if(!($tag instanceof CompoundTag)){
//this should never happen, but it's still possible due to lack of native type safety
throw new CorruptedChunkException("Expected TAG_List<TAG_Compound> for '$context'");
}
$result[] = $tag;
}
return $result;
}
public static function getProviderName() : string{ public static function getProviderName() : string{
return "mcregion"; return "mcregion";
} }