ppt-dump: catch exceptions to avoid system reports
This commit is contained in:
parent
5cb04b605f
commit
73d1cd36be
@ -5,7 +5,7 @@
|
|||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
#
|
#
|
||||||
|
|
||||||
import sys, os.path, getopt
|
import sys, os.path, getopt, traceback
|
||||||
sys.path.append(sys.path[0]+"/msodump.zip")
|
sys.path.append(sys.path[0]+"/msodump.zip")
|
||||||
from msodumper import ole, pptstream, globals, olestream
|
from msodumper import ole, pptstream, globals, olestream
|
||||||
from msodumper.globals import error
|
from msodumper.globals import error
|
||||||
@ -117,11 +117,16 @@ def main (args):
|
|||||||
usage(exname)
|
usage(exname)
|
||||||
return
|
return
|
||||||
|
|
||||||
dumper = PPTDumper(args[0], globals.params)
|
try:
|
||||||
if not dumper.dump():
|
dumper = PPTDumper(args[0], globals.params)
|
||||||
error("FAILURE\n")
|
if not dumper.dump():
|
||||||
if globals.params.dumpText:
|
error("FAILURE\n")
|
||||||
globals.dumptext()
|
if globals.params.dumpText:
|
||||||
|
globals.dumptext()
|
||||||
|
except Exception as ex:
|
||||||
|
traceback.print_exc()
|
||||||
|
error("Could not parse")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main(sys.argv)
|
main(sys.argv)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user