Skip to content

Commit fcfffae

Browse files
committed
safe decode
1 parent 641019b commit fcfffae

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

modelconverter/packages/rvc4/benchmark.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ def _adb_run(self, args, **kwargs) -> Tuple[int, str, str]:
5151
f"stdout:\n{stdout}\n"
5252
f"stderr:\n{stderr}\n"
5353
)
54-
return result.returncode, stdout.decode("utf-8"), stderr.decode(
55-
"utf-8"
54+
return (
55+
result.returncode,
56+
stdout.decode(errors="ignore"),
57+
stderr.decode(errors="ignore"),
5658
)
5759

5860
def shell(self, cmd: str) -> Tuple[int, str, str]:

modelconverter/utils/subprocess.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ def subprocess_run(
5454
if not silent:
5555
log_message(info_string)
5656
if result.stderr:
57-
string = result.stderr.decode("utf-8")
57+
string = result.stderr.decode(errors="ignore")
5858
if not silent:
5959
log_message(f"[ STDERR ]:\n{string}")
6060
info_string += f"\n[ STDERR ]:\n{string}"
6161
if result.stdout:
62-
string = result.stdout.decode("utf-8")
62+
string = result.stdout.decode(errors="ignore")
6363
if not silent:
6464
log_message(f"[ STDOUT ]:\n{string}")
6565
info_string += f"\n[ STDOUT ]:\n{string}"

0 commit comments

Comments
 (0)