Merge pull request #664 from onekey-sec/fix-cpio

Handle UnicodeDecodeError on invalid CPIO entry
onekey-sec · Oct 9, 2023 · 8667d57 · 8667d57
2 parents d302d0d + 91bf8a0
commit 8667d57
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/unblob/handlers/archive/cpio.py b/unblob/handlers/archive/cpio.py
@@ -165,7 +165,10 @@ def parse(self):  # noqa: C901
                     "CPIO entry filename is not null-byte terminated"
                 )
 
-            filename = snull(tmp_filename).decode("utf-8")
+            try:
+                filename = snull(tmp_filename).decode("utf-8")
+            except UnicodeDecodeError as e:
+                raise InvalidInputFormat from e
 
             if filename == CPIO_TRAILER_NAME:
                 current_offset += self._pad_content(c_filesize)