diff options
| author | serpilliere <devnull@localhost> | 2011-09-09 14:11:43 +0200 |
|---|---|---|
| committer | serpilliere <devnull@localhost> | 2011-09-09 14:11:43 +0200 |
| commit | 801c4630d61e0d34496d6247f15be1cade3de121 (patch) | |
| tree | cfc139d5765ab09b0ec99e4ec1f52ffb41cb0b76 | |
| parent | be5ff3e34535c96b7761e73655d911e665a07d77 (diff) | |
| download | miasm-801c4630d61e0d34496d6247f15be1cade3de121.tar.gz miasm-801c4630d61e0d34496d6247f15be1cade3de121.zip | |
fix java asm; java class parser
| -rw-r--r-- | miasm/tools/pe_helper.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/miasm/tools/pe_helper.py b/miasm/tools/pe_helper.py index 50428ca8..8e969c70 100644 --- a/miasm/tools/pe_helper.py +++ b/miasm/tools/pe_helper.py @@ -16,6 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # from elfesteem import * +from elfesteem import pe from elfesteem import cstruct from miasm.arch.ia32_arch import * @@ -27,7 +28,7 @@ import miasm.core.bin_stream import os import re from miasm.tools import to_c_helper -import miasm.core.bin_stream +from miasm.core import bin_stream pe_cache = {} def pe_from_name(n): global pe_cache @@ -81,7 +82,7 @@ def is_rva_in_code_section(e, rva): def guess_func_destack_dis(e, ad): job_done = set() symbol_pool = asmbloc.asm_symbol_pool() - in_str = bin_stream.bin_stream(e.virt) + in_str = bin_stream(e.virt) all_bloc = asmbloc.dis_bloc_all(x86_mn, in_str, ad, job_done, symbol_pool, follow_call = False, patch_instr_symb = False) return guess_func_destack(all_bloc) @@ -143,7 +144,7 @@ def get_import_address(e): libname = s.dlldescname.name.lower() for ii, imp in enumerate(s.impbynames): - if isinstance(imp, pe_init.ImportByName): + if isinstance(imp, pe.ImportByName): funcname = imp.name else: funcname = imp |