CIRCL
/
PyCIRCLean
mirror of https://github.com/CIRCL/PyCIRCLean
2
0
Fork 0
Code Issues Releases Wiki Activity

Handle invalid docx properly

pull/9/head
Raphaël Vinot 2016-02-01 14:19:51 +01:00
parent e8de330d34
commit 51615f8887
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/filecheck.py
View File

@ -346,7 +346,13 @@ class KittenGroomerFileCheck(KittenGroomerBase):
def _ooxml(self): def _ooxml(self):
self.cur_file.add_log_details('processing_type', 'ooxml') 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: # There are probably other potentially malicious features:
# fonts, custom props, custom XML # fonts, custom props, custom XML
if doc.is_macro_enabled or len(doc.features.macros) > 0: if doc.is_macro_enabled or len(doc.features.macros) > 0: