Skip to content

Commit 33a564d

Browse files
committed
ObjectReader save function fix, check if self._read_until is set before using it
1 parent 76bccce commit 33a564d

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

‎UnityPy/classes/Object.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import types
77
from ..exceptions import TypeTreeError as TypeTreeError
88

9+
910
class Object(object):
1011
type_tree: dict
1112

@@ -62,17 +63,15 @@ def class_to_dict(value):
6263
if isinstance(value, list):
6364
return [class_to_dict(val) for val in value]
6465
elif isinstance(value, dict):
65-
return {
66-
key: class_to_dict(val)
67-
for key, val in value.items()
68-
}
66+
return {key: class_to_dict(val) for key, val in value.items()}
6967
elif hasattr(value, "__dict__"):
7068
if isinstance(value, PPtr):
7169
return {"m_PathID": value.path_id, "m_FileID": value.file_id}
7270
return {
7371
key: class_to_dict(val)
7472
for key, val in value.__dict__.items()
75-
if not isinstance(value, (types.FunctionType, types.MethodType)) and not key in ["type_tree", "assets_file"]
73+
if not isinstance(value, (types.FunctionType, types.MethodType))
74+
and not key in ["type_tree", "assets_file"]
7675
}
7776
else:
7877
return value
@@ -98,7 +97,8 @@ def save(self, writer: EndianBinaryWriter = None, intern_call=False):
9897
self.save_typetree()
9998
else:
10099
raise NotImplementedError(
101-
"There is no save function for this obj.type nor has it any typetree nodes that could be used.")
100+
"There is no save function for this obj.type nor has it any typetree nodes that could be used."
101+
)
102102

103103
def _save(self, writer):
104104
# the reader is actually an ObjectReader,
@@ -177,4 +177,3 @@ def keys(self):
177177

178178
def __repr__(self):
179179
return "<NodeHelper - %s>" % self.__dict__.__repr__()
180-

‎UnityPy/files/ObjectReader.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def write(self, header, writer: EndianBinaryWriter, data_writer: EndianBinaryWri
9696
# so following code appends the missing data back to edited objects
9797
if self.type != ClassIDType.MonoBehaviour:
9898
end_pos = self.byte_start + self.byte_size
99-
if self._read_until != end_pos:
99+
if self._read_until and self._read_until != end_pos:
100100
self.reader.Position = self._read_until
101101
data += self.reader.read_bytes(end_pos - self._read_until)
102102
else:

0 commit comments

Comments
 (0)