LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

nbt array lengths are unsigned (see issue #1190)

Browse Source
This commit is contained in:
Aaron Griffith
2015-02-02 04:59:43 -05:00
parent 9a119a2dce
commit 32fbc1dea2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
overviewer_core/nbt.py
View File

@@ -65,7 +65,9 @@ class NBTFileReader(object):
# compile the unpacker's into a classes # compile the unpacker's into a classes
_byte = struct.Struct("b") _byte = struct.Struct("b")
_short = struct.Struct(">h") _short = struct.Struct(">h")
_ushort = struct.Struct(">H")
_int = struct.Struct(">i") _int = struct.Struct(">i")
_uint = struct.Struct(">I")
_long = struct.Struct(">q") _long = struct.Struct(">q")
_float = struct.Struct(">f") _float = struct.Struct(">f")
_double = struct.Struct(">d") _double = struct.Struct(">d")
@@ -128,17 +130,17 @@ class NBTFileReader(object):
return self._double.unpack(bytes)[0] return self._double.unpack(bytes)[0]
def _read_tag_byte_array(self): def _read_tag_byte_array(self):
length = self._read_tag_int() length = self._uint.unpack(self._file.read(4))[0]
bytes = self._file.read(length) bytes = self._file.read(length)
return bytes return bytes
def _read_tag_int_array(self): def _read_tag_int_array(self):
length = self._read_tag_int() length = self._uint.unpack(self._file.read(4))[0]
int_bytes = self._file.read(length*4) int_bytes = self._file.read(length*4)
return struct.unpack(">%ii" % length, int_bytes) return struct.unpack(">%ii" % length, int_bytes)
def _read_tag_string(self): def _read_tag_string(self):
length = self._read_tag_short() length = self._ushort.unpack(self._file.read(2))[0]
# Read the string # Read the string
string = self._file.read(length) string = self._file.read(length)
# decode it and return # decode it and return
@@ -146,7 +148,7 @@ class NBTFileReader(object):
def _read_tag_list(self): def _read_tag_list(self):
tagid = self._read_tag_byte() tagid = self._read_tag_byte()
length = self._read_tag_int() length = self._uint.unpack(self._file.read(4))[0]
read_method = self._read_tagmap[tagid] read_method = self._read_tagmap[tagid]
l = [] l = []