diff --git a/src/filters/msodump.zip b/src/filters/msodump.zip index 22a3e5cd..a1b6d9e6 100644 Binary files a/src/filters/msodump.zip and b/src/filters/msodump.zip differ diff --git a/src/filters/ppt-dump.py b/src/filters/ppt-dump.py index d41c5891..6109eec4 100755 --- a/src/filters/ppt-dump.py +++ b/src/filters/ppt-dump.py @@ -116,9 +116,13 @@ def main (args): usage(exname) return - dumper = PPTDumper(args[0], globals.params) - if not dumper.dump(): - error("FAILURE\n") + try: + dumper = PPTDumper(args[0], globals.params) + if not dumper.dump(): + error("ppt-dump: dump error\n") + except: + error("ppt-dump: FAILURE (bad format?)\n") + if globals.params.dumpText: print(globals.textdump.replace("\r", "\n")) diff --git a/src/filters/xlsxmltocsv.py b/src/filters/xlsxmltocsv.py index 84b54c3b..f73fe853 100755 --- a/src/filters/xlsxmltocsv.py +++ b/src/filters/xlsxmltocsv.py @@ -45,4 +45,8 @@ class XlsXmlHandler(xml.sax.handler.ContentHandler): elif name == "worksheet": print("") -xml.sax.parse(sys.stdin, XlsXmlHandler()) +try: + xml.sax.parse(sys.stdin, XlsXmlHandler()) +except: + sys.exit(1) +sys.exit(0)