diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2014-12-26 14:27:56 +0100 |
|---|---|---|
| committer | serpilliere <serpilliere@users.noreply.github.com> | 2014-12-26 14:27:56 +0100 |
| commit | 43b3962dd0dd7ce791cf28be78a44956bada8b76 (patch) | |
| tree | 793ac2b87d54d0396f2d48ae147785ea3ed55703 /miasm2/analysis/binary.py | |
| parent | 73c67175687e4dfbc3a2c40a57a616db45e6f7f2 (diff) | |
| parent | c9657d8b5e4380848a992d100d8072f49d835637 (diff) | |
| download | miasm-43b3962dd0dd7ce791cf28be78a44956bada8b76.tar.gz miasm-43b3962dd0dd7ce791cf28be78a44956bada8b76.zip | |
Merge pull request #26 from commial/fix-vm_loads
Fix vm loads Everything seems ok, thanks Merry Christmiasm to you !
Diffstat (limited to 'miasm2/analysis/binary.py')
| -rw-r--r-- | miasm2/analysis/binary.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/analysis/binary.py b/miasm2/analysis/binary.py index a46a252c..17c87761 100644 --- a/miasm2/analysis/binary.py +++ b/miasm2/analysis/binary.py @@ -122,7 +122,7 @@ class ContainerPE(Container): # Build executable instance try: if vm is not None: - self._executable = vm_load_pe(vm, filename) + self._executable = vm_load_pe(vm, data) else: self._executable = pe_init.PE(data) except Exception, error: @@ -156,7 +156,7 @@ class ContainerELF(Container): # Build executable instance try: if vm is not None: - self._executable = vm_load_elf(vm, filename) + self._executable = vm_load_elf(vm, data) else: self._executable = elf_init.ELF(data) except Exception, error: |