diff options
| author | Pierre Lalet <pierre@droids-corp.org> | 2016-02-09 21:55:35 +0100 |
|---|---|---|
| committer | Pierre Lalet <pierre@droids-corp.org> | 2016-02-09 21:55:35 +0100 |
| commit | 2cf69707481ba4b0dd163b49d99bc9a021162944 (patch) | |
| tree | 655abfe612c42a13bddf406466a6cf21e10feab4 | |
| parent | 0b03ea9205285d0b178076c06e52c8d66a8d3865 (diff) | |
| parent | f5b9017229a614218891cc0dfdcfcd35e92c25ec (diff) | |
| download | miasm-2cf69707481ba4b0dd163b49d99bc9a021162944.tar.gz miasm-2cf69707481ba4b0dd163b49d99bc9a021162944.zip | |
Merge pull request #324 from serpilliere/jitter_handle_ret
Jitter: handle emulated funcs ret
| -rw-r--r-- | miasm2/jitter/jitload.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/miasm2/jitter/jitload.py b/miasm2/jitter/jitload.py index 1bb9a806..9a4b4ff4 100644 --- a/miasm2/jitter/jitload.py +++ b/miasm2/jitter/jitload.py @@ -417,9 +417,14 @@ class jitter: else: log.debug('%r', fname) raise ValueError('unknown api', hex(jitter.pc), repr(fname)) - func(jitter) + ret = func(jitter) jitter.pc = getattr(jitter.cpu, jitter.ir_arch.pc.name) - return True + + # Don't break on a None return + if ret is None: + return True + else: + return ret def handle_function(self, f_addr): """Add a brakpoint which will trigger the function handler""" |