diff options
| -rw-r--r-- | miasm2/analysis/binary.py | 4 | ||||
| -rw-r--r-- | miasm2/analysis/sandbox.py | 27 |
2 files changed, 13 insertions, 18 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: diff --git a/miasm2/analysis/sandbox.py b/miasm2/analysis/sandbox.py index f7009f3e..ed178f8a 100644 --- a/miasm2/analysis/sandbox.py +++ b/miasm2/analysis/sandbox.py @@ -159,7 +159,7 @@ class OS_Win(OS): ] def __init__(self, custom_methods, *args, **kwargs): - from miasm2.jitter.loader.pe import vm_load_pe, preload_pe, libimp_pe + from miasm2.jitter.loader.pe import vm_load_pe, vm_load_pe_libs, preload_pe, libimp_pe super(OS_Win, self).__init__(custom_methods, *args, **kwargs) @@ -173,19 +173,15 @@ class OS_Win(OS): all_pe = [] # Load libs in memory - for dll_fname in self.ALL_IMP_DLL: - fname = os.path.join('win_dll', dll_fname) - e_lib = vm_load_pe(self.jitter.vm, fname) - - libs.add_export_lib(e_lib, dll_fname) - all_pe.append(e_lib) + all_pe = vm_load_pe_libs(self.ALL_IMP_DLL, libs) # Patch libs imports - for pe in all_pe: + for pe in all_pe.values(): preload_pe(self.jitter.vm, pe, libs) # Load main pe - self.pe = vm_load_pe(self.jitter.vm, self.fname) + with open(self.fname) as fstream: + self.pe = vm_load_pe(self.jitter.vm, fstream.read()) # Fix pe imports preload_pe(self.jitter.vm, self.pe, libs) @@ -225,17 +221,16 @@ class OS_Linux(OS): super(OS_Linux, self).__init__(custom_methods, *args, **kwargs) # Import manager - libs = libimp_elf() - self.libs = libs + self.libs = libimp_elf() - elf = vm_load_elf(self.jitter.vm, self.fname) - self.elf = elf - preload_elf(self.jitter.vm, elf, libs) + with open(self.fname) as fstream: + self.elf = vm_load_elf(self.jitter.vm, fstream.read()) + preload_elf(self.jitter.vm, self.elf, self.libs) - self.entry_point = elf.Ehdr.entry + self.entry_point = self.elf.Ehdr.entry # Library calls handler - self.jitter.add_lib_handler(libs, custom_methods) + self.jitter.add_lib_handler(self.libs, custom_methods) class OS_Linux_str(OS): def __init__(self, custom_methods, *args, **kwargs): |