From ce888766cd5a7947f250c0733d2429aac4587d8d Mon Sep 17 00:00:00 2001 From: Srinivas P G Date: Wed, 22 Nov 2017 16:18:45 -0500 Subject: [PATCH] Fix for issue 556 and 591 (#590) * version argument in manticore * Fix 591 - Exception Handler --- manticore/__main__.py | 2 ++ manticore/core/cpu/abstractcpu.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/manticore/__main__.py b/manticore/__main__.py index 720cbc0..bb3e30b 100644 --- a/manticore/__main__.py +++ b/manticore/__main__.py @@ -53,6 +53,8 @@ def parse_arguments(): parser.add_argument('--workspace', type=str, default=None, help=("A folder name for temporaries and results." "(default mcore_?????)")) + parser.add_argument('--version', action='version', version='Manticore 0.1.5', + help='Show program version information') parsed = parser.parse_args(sys.argv[1:]) if parsed.procs <= 0: diff --git a/manticore/core/cpu/abstractcpu.py b/manticore/core/cpu/abstractcpu.py index b9a447b..a5d2bd7 100644 --- a/manticore/core/cpu/abstractcpu.py +++ b/manticore/core/cpu/abstractcpu.py @@ -789,7 +789,7 @@ class Cpu(Eventful): emu = UnicornEmulator(self) try: emu.emulate(insn) - except e: + except Exception as e: raise InstructionEmulationError(str(e)) finally: # We have been seeing occasional Unicorn issues with it not clearing