Skip to content

Commit 7ad80ef

Browse files
committed
Squashed commit of the following:
commit 40fedd9bb0fbb877a3c5cfd35ddf97c045201078 Author: Rudolf Kolbe <rudolf.kolbe@st.ovgu.de> Date: Wed Jun 29 12:24:59 2022 +0200 fix get_nodes commit 6457c5dd653a88b5fcd590f35b4aee1e3b9f35fb Author: Rudolf Kolbe <rudolf.kolbe@st.ovgu.de> Date: Wed Jun 29 12:23:41 2022 +0200 decode strings withs surrogateescape commit 6e021424fe2f73ab647dd1e7b2acfb7970dd0457 Author: Rudolf Kolbe <rudolf.kolbe@st.ovgu.de> Date: Wed Jun 29 10:17:11 2022 +0200 fix memory leak commit 1e0972a2d2ff1b8154b7294e060d52df589564bf Author: Rudolf Kolbe <rudolf.kolbe@st.ovgu.de> Date: Tue Jun 28 13:36:27 2022 +0200 fix TypelessData -> memoryview commit c2441d9361c0e35f1dfdde4dd92abc3a946509a9 Author: Rudolf Kolbe <rudolf.kolbe@st.ovgu.de> Date: Tue Jun 28 00:58:25 2022 +0200 TypeTreeHelper.c - use memoryview for typelessdata and fix class key name commit 4ce01cdc76ec0479fe0c4bcb8a54f7e4488bd9a7 Author: Rudolf Kolbe <rudolf.kolbe@st.ovgu.de> Date: Mon Jun 27 23:03:11 2022 +0200 improve memoryview read_string_to_null commit fbb7687fd67417ad842ba2b6e8e66a0fb9cb5cee Author: Rudolf Kolbe <rudolf.kolbe@st.ovgu.de> Date: Mon Jun 27 23:02:52 2022 +0200 implement C-TypeTreeNode commit 60c8ebb428424f4143f5f3824701a1eaf93b44e5 Author: Rudolf Kolbe <rudolf.kolbe@st.ovgu.de> Date: Mon Jun 20 14:13:32 2022 +0200 typetreehelper - c
1 parent be8a822 commit 7ad80ef

7 files changed

Lines changed: 799 additions & 17 deletions

File tree

‎UnityPy/files/SerializedFile.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -369,11 +369,14 @@ def read_type_tree_blob(self):
369369
if not config.SERIALIZED_FILE_PARSE_TYPETREE:
370370
return [], string_buffer_reader.bytes
371371

372-
type_tree = [None] * number_of_nodes
373-
for i, raw_node in enumerate(node_struct.iter_unpack(struct_data)):
374-
type_tree[i] = node = TypeTreeNode(zip(keys, raw_node))
375-
node.type = read_string(string_buffer_reader, node.type_str_offset)
376-
node.name = read_string(string_buffer_reader, node.name_str_offset)
372+
type_tree = [
373+
TypeTreeNode(
374+
**dict(zip(keys, raw_node)),
375+
type=read_string(string_buffer_reader, raw_node[3]),
376+
name=read_string(string_buffer_reader, raw_node[4]),
377+
)
378+
for i, raw_node in enumerate(node_struct.iter_unpack(struct_data))
379+
]
377380

378381
return type_tree, string_buffer_reader.bytes
379382

@@ -414,6 +417,7 @@ def save(self, packer: str = None) -> bytes:
414417
header = self.header
415418
meta_writer = EndianBinaryWriter(endian=header.endian)
416419
data_writer = EndianBinaryWriter(endian=header.endian)
420+
417421
if header.version >= 7:
418422
meta_writer.write_string_to_null(self.unity_version)
419423

‎UnityPy/helpers/ImportHelper.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ def check_file_type(input_) -> Union[FileType, EndianBinaryReader]:
5353
if reader.Length < 20:
5454
return FileType.ResourceFile, reader
5555

56-
try:
57-
signature = reader.read_string_to_null(20)
58-
except ValueError:
59-
signature = ""
56+
57+
signature = reader.read_string_to_null(20)
58+
6059
reader.Position = 0
6160
if signature in [
6261
"UnityWeb",

‎UnityPy/helpers/TypeTreeHelper.py‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class TypeTreeNode(object):
2020
"type",
2121
"name",
2222
"ref_type_hash",
23+
"variable_count",
2324
)
2425
type: str
2526
name: str
@@ -34,6 +35,7 @@ class TypeTreeNode(object):
3435
type: str
3536
name: str
3637
ref_type_hash: str
38+
variable_count: int
3739

3840
def __init__(self, data: Union[dict, Iterable[Tuple]] = None, **kwargs):
3941
if isinstance(data, dict):
@@ -50,6 +52,12 @@ def __repr__(self):
5052
return f"<TypeTreeNode({self.level} {self.type} {self.name})>"
5153

5254

55+
try:
56+
from ..UnityPyBoost import TypeTreeNode, read_typetree as read_typetree_c
57+
except:
58+
read_typetree_c = None
59+
60+
5361
def node_dict_to_class(nodes: List[dict]) -> List[TypeTreeNode]:
5462
"""Converts all dict-type nodes into TypeTreeNodes
5563
@@ -128,13 +136,11 @@ def get_nodes(nodes: List[TypeTreeNode], index: int) -> list:
128136
list
129137
A list of nodes
130138
"""
131-
nodes2 = [nodes[index]]
132139
level = nodes[index].level
133-
for node in nodes[index + 1 :]:
140+
for i, node in enumerate(nodes[index + 1 :], index + 1):
134141
if node.level <= level:
135-
return nodes2
136-
nodes2.append(node)
137-
return nodes2
142+
return nodes[index:i]
143+
return nodes[index:]
138144

139145

140146
def read_typetree(
@@ -154,9 +160,13 @@ def read_typetree(
154160
dict
155161
The parsed typtree
156162
"""
157-
# reader.reset()
163+
reader.reset()
164+
158165
nodes = check_nodes(nodes)
159166

167+
if read_typetree_c:
168+
return read_typetree_c(nodes, reader.read_bytes(reader.byte_size))
169+
160170
obj = {}
161171
i = c_uint32(1)
162172
while i.value < len(nodes):

‎UnityPy/streams/EndianBinaryReader.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,10 @@ def read_aligned_string(self):
284284
def read_string_to_null(self, max_length=32767) -> str:
285285
match = reNot0.search(self.view, self.Position, self.Position + max_length)
286286
if not match:
287-
raise ValueError("Unterminated string")
287+
if self.Position + max_length >= self.Length:
288+
raise Exception("String not terminated")
289+
else:
290+
return bytes(self.read_bytes(max_length)).decode("utf8", "surrogateescape")
288291
ret = match[1].decode("utf8", "surrogateescape")
289292
self.Position = match.end()
290293
return ret

0 commit comments

Comments
 (0)