From 976337d3aaada7adb2e1f2788c8558a024652b2d Mon Sep 17 00:00:00 2001 From: Fabrice Desclaux Date: Thu, 29 Oct 2015 07:25:31 +0100 Subject: Core/asmbloc: Fix get_subcall_instr --- miasm2/core/asmbloc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'miasm2') diff --git a/miasm2/core/asmbloc.py b/miasm2/core/asmbloc.py index 31e4bdd7..9f67747c 100644 --- a/miasm2/core/asmbloc.py +++ b/miasm2/core/asmbloc.py @@ -203,10 +203,14 @@ class asm_bloc(object): def get_subcall_instr(self): if not self.lines: return None - for i in xrange(-1, -1 - self.lines[0].delayslot - 1, -1): + delayslot = self.lines[0].delayslot + end_index = len(self.lines) - 1 + ds_max_index = max(end_index - delayslot, 0) + for i in xrange(end_index, ds_max_index - 1, -1): l = self.lines[i] if l.is_subcall(): return l + return None def get_next(self): for x in self.bto: -- cgit 1.4.1