Skip to content

Commit 4fff082

Browse files
committed
Streams: surrogateescape encoding exception
1 parent 5aaca5d commit 4fff082

2 files changed

Lines changed: 6 additions & 18 deletions

File tree

‎UnityPy/streams/EndianBinaryReader.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def read_double(self) -> float:
7171
def read_boolean(self) -> bool:
7272
return bool(struct.unpack(self.endian + "?", self.read(1))[0])
7373

74-
def read_string(self, size=None, encoding="utf-8") -> str:
74+
def read_string(self, size=None, encoding="utf8") -> str:
7575
if size is None:
7676
ret = self.read_string_to_null()
7777
else:
@@ -89,13 +89,13 @@ def read_string_to_null(self, max_length=32767) -> str:
8989
c = self.read(1)
9090
if not c:
9191
raise ValueError("Unterminated string: %r" % ret)
92-
return b"".join(ret).decode("utf8", "backslashreplace")
92+
return b"".join(ret).decode("utf8", "surrogateescape")
9393

9494
def read_aligned_string(self):
9595
length = self.read_int()
9696
if 0 < length <= self.Length - self.Position:
9797
string_data = bytes(self.read_bytes(length))
98-
result = string_data.decode("utf8", "backslashreplace")
98+
result = string_data.decode("utf8", "surrogateescape")
9999
self.align_stream()
100100
return result
101101
return ""
@@ -203,7 +203,7 @@ def read_aligned_string(self):
203203
length = self.read_int()
204204
if 0 < length <= self.Length - self.Position:
205205
string_data = self.read_bytes(length)
206-
result = bytes(string_data).decode("utf8", "backslashreplace")
206+
result = bytes(string_data).decode("utf8", "surrogateescape")
207207
self.align_stream()
208208
return result
209209
return ""

‎UnityPy/streams/EndianBinaryWriter.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,12 @@ def write_double(self, value: float):
7979
def write_boolean(self, value: bool):
8080
self.write(struct.pack(self.endian + "?", value))
8181

82-
"""
83-
def write_string(self, size=None, encoding="utf-8") -> str:
84-
if size is None:
85-
ret = self.write_string_to_null()
86-
else:
87-
ret = struct.unpack(f"{self.endian}{size}is", self.read(size))[0]
88-
try:
89-
return ret.decode(encoding)
90-
except UnicodeDecodeError:
91-
return ret
92-
"""
93-
9482
def write_string_to_null(self, value: str):
95-
self.write(value.encode("utf8", "backslashreplace"))
83+
self.write(value.encode("utf8", "surrogateescape"))
9684
self.write(b"\0")
9785

9886
def write_aligned_string(self, value: str):
99-
bstring = value.encode("utf8", "backslashreplace")
87+
bstring = value.encode("utf8", "surrogateescape")
10088
self.write_int(len(bstring))
10189
self.write(bstring)
10290
self.align_stream(4)

0 commit comments

Comments
 (0)