0

Added better error handling for corrupt chunks

This commit is contained in:
Andrew Brown
2012-03-17 22:41:11 -04:00
parent 9b7226e91e
commit e9cf747513
4 changed files with 71 additions and 10 deletions

View File

@@ -180,11 +180,15 @@ class NBTFileReader(object):
except (struct.error, ValueError), e:
raise CorruptNBTError("could not parse nbt: %s" % (str(e),))
class CorruptRegionError(Exception):
class CorruptionError(Exception):
pass
class CorruptRegionError(CorruptionError):
"""An exception raised when the MCRFileReader class encounters an
error during region file parsing.
"""
pass
class CorruptChunkError(CorruptionError):
pass
# For reference, the MCR format is outlined at
# <http://www.minecraftwiki.net/wiki/Beta_Level_Format>
@@ -294,4 +298,7 @@ class MCRFileReader(object):
raise CorruptRegionError("chunk length is invalid")
data = StringIO.StringIO(data)
return NBTFileReader(data, is_gzip=is_gzip).read_all()
try:
return NBTFileReader(data, is_gzip=is_gzip).read_all()
except Exception, e:
raise CorruptChunkError("Misc error parsing chunk: " + str(e))