diff options
| author | Camille Mougey <commial@gmail.com> | 2015-04-05 14:13:30 +0200 |
|---|---|---|
| committer | Camille Mougey <commial@gmail.com> | 2015-04-05 14:13:30 +0200 |
| commit | 09a0e1082c04c7f978b228d5b8345d6758353151 (patch) | |
| tree | 4eeecf4b7dd9ecc31d21ec6fbf3e8e1dbeb05612 | |
| parent | 06800decdd01d7abe5add7b8932cd8a21eca9640 (diff) | |
| parent | c381bb17312994206f77dc901f7cd989a8ff20cd (diff) | |
| download | miasm-09a0e1082c04c7f978b228d5b8345d6758353151.tar.gz miasm-09a0e1082c04c7f978b228d5b8345d6758353151.zip | |
Merge pull request #140 from serpilliere/set_offset_fix
Asmbloc: use correct api in wedge merge
| -rw-r--r-- | miasm2/core/asmbloc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miasm2/core/asmbloc.py b/miasm2/core/asmbloc.py index 612a2e3b..f2578876 100644 --- a/miasm2/core/asmbloc.py +++ b/miasm2/core/asmbloc.py @@ -752,7 +752,7 @@ class BlockChainWedge(object): def merge(self, chain): """Best effort merge two block chains Return the list of resulting blockchains""" - chain.blocks[0].label.offset = self.offset_max + self.symbol_pool.set_offset(chain.blocks[0].label, self.offset_max) chain.place() return [self, chain] |