Handle invalid docx properly

2016-02-01 14:19:51 +01:00 · 2016-02-01 14:19:51 +01:00 · 51615f8887
parent e8de330d34
commit 51615f8887
1 changed files with 7 additions and 1 deletions
--- a/bin/filecheck.py
+++ b/bin/filecheck.py
@ -346,7 +346,13 @@ class KittenGroomerFileCheck(KittenGroomerBase):

    def _ooxml(self):
        self.cur_file.add_log_details('processing_type', 'ooxml')
-        doc = officedissector.doc.Document(self.cur_file.src_path)
+        try:
+            doc = officedissector.doc.Document(self.cur_file.src_path)
+        except Exception:
+            # Invalid file
+            self.cur_file.make_dangerous()
+            self._safe_copy()
+            return
        # There are probably other potentially malicious features:
        # fonts, custom props, custom XML
        if doc.is_macro_enabled or len(doc.features.macros) > 0: