From 5ac9e45d866063deff3a7dee14a1f10a804cebc8 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Wed, 23 Sep 2020 17:36:46 -0700
Subject: [PATCH] erpt: support older erpt binaries

---
 utilities/erpt.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/utilities/erpt.py b/utilities/erpt.py
index 021d24265..770898752 100644
--- a/utilities/erpt.py
+++ b/utilities/erpt.py
@@ -273,8 +273,9 @@ def get_full(nxo):
             s.resolved = LOAD_BASE + s.value
             if s.name:
                 if s.type == STT_FUNC:
-                    print(hex(s.resolved), s.name)
+                    #print(hex(s.resolved), s.name)
                     #idaapi.add_entry(s.resolved, s.resolved, s.name, 0)
+                    pass
                 else:
                     #idaapi.force_name(s.resolved, s.name)
                     pass
@@ -353,12 +354,18 @@ def find_categories(full, num_fields):
     return list(up('<'+'I'*num_fields, full[ind:ind+4*num_fields]))
 
 def find_types(full, num_fields):
-    KNOWN = range(10) + [4, 4, 2, 4]
-    ind = full.index(''.join(pk('<I', i) for i in KNOWN))
+    KNOWN     = range(10) + [4, 4, 2, 4]
+    KNOWN_OLD = range(10) + [4, 4, 0, 4]
+    try:
+        ind = full.index(''.join(pk('<I', i) for i in KNOWN))
+    except ValueError:
+        ind = full.index(''.join(pk('<I', i) for i in KNOWN_OLD))
     return list(up('<'+'I'*num_fields, full[ind:ind+4*num_fields]))
 
 def find_flags(full, num_fields):
     KNOWN = '\x00' + ('\x01'*6) + '\x00\x01\x01\x00'
+    if num_fields < 443 + len(KNOWN):
+        return [0] * num_fields
     ind = full.index(KNOWN) - 443
     return list(up('<'+'B'*num_fields, full[ind:ind+num_fields]))