From 6b032f4db67b15a16a242db1fbea5ef5dceb79c2 Mon Sep 17 00:00:00 2001 From: Fabrice Desclaux Date: Sun, 31 Jan 2016 21:09:08 +0100 Subject: Core/cpu: fix pre_dis atomic --- miasm2/core/cpu.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'miasm2/core/cpu.py') diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py index 8195f920..050648f5 100644 --- a/miasm2/core/cpu.py +++ b/miasm2/core/cpu.py @@ -1096,8 +1096,12 @@ class cls_mn(object): bs_o.enter_atomic_mode() offset_o = offset - pre_dis_info, bs, mode, offset, prefix_len = cls.pre_dis( - bs_o, mode_o, offset) + try: + pre_dis_info, bs, mode, offset, prefix_len = cls.pre_dis( + bs_o, mode_o, offset) + except: + bs_o.leave_atomic_mode() + raise candidates = cls.guess_mnemo(bs, mode, pre_dis_info, offset) if not candidates: bs_o.leave_atomic_mode() -- cgit 1.4.1