Merge pull request #1275 from Ana06/fix-double-ordinals

Remove duplicated ordinals in get_export_name_addr_list

1 files changed, 5 insertions, 10 deletions

diff --git a/miasm/jitter/loader/pe.py b/miasm/jitter/loader/pe.py
index 723cb06b..28010b74 100644
--- a/miasm/jitter/loader/pe.py
+++ b/miasm/jitter/loader/pe.py
@@ -137,10 +137,12 @@ def is_redirected_export(pe_obj, addr):
 
 
 def get_export_name_addr_list(e):
-    """Collect names and addresses of symbols exported by the given PE.
+    """Collect names/ordinals and addresses of symbols exported by the given PE.
     @e: PE instance
-    Returns a list of tuples (symbol name string, virtual address).
-    
+    Returns a list of tuples:
+        (symbol name string, virtual address)
+        (ordinal number, virtual address)
+
     Example:
 
         pe = miasm.analysis.binary.Container.from_string(buf)
@@ -159,13 +161,6 @@ def get_export_name_addr_list(e):
         out.append((f_name, e.rva2virt(addr.rva)))
 
     # add func ordinal
-    for i, o in enumerate(e.DirExport.f_nameordinals):
-        addr = e.DirExport.f_address[o.ordinal]
-        # log.debug('%s %s %s' % (o.ordinal, e.DirExport.expdesc.base,
-        # hex(e.rva2virt(addr.rva))))
-        out.append(
-            (o.ordinal + e.DirExport.expdesc.base, e.rva2virt(addr.rva)))
-
     for i, s in enumerate(e.DirExport.f_address):
         if not s.rva:
             continue