Sorta fix for #78

Author: sevaa

dwex/__main__.py

@@ -19,7 +19,7 @@
 from .treedlg import TreeDlg
 
 # Sync with version in setup.py
-version = (4, 55)
+version = (4, 56)
 the_app = None
 
 # TODO:

dwex/dwarfutil.py

@@ -141,8 +141,11 @@ def top_die_file_name(die, Default = 'N/A'):
         if val > 0:
             if die.cu._lineprogram is None:
                 die.cu._lineprogram = die.dwarfinfo.line_program_for_CU(die.cu)
-            delta = 1 if die.cu.version < 5 else 0
-            return strip_path(die.cu._lineprogram.header.file_entry[val-delta].name.decode('utf-8', errors='ignore'))
+            if die.cu._lineprogram: # No lineprogram is effectively corruption
+                delta = 1 if die.cu.header.version < 5 else 0
+                return strip_path(die.cu._lineprogram.header.file_entry[val-delta].name.decode('utf-8', errors='ignore'))
+            else:
+                return "(unknown)"
     return Default
 
  # See #1742

dwex/patch.py

@@ -181,6 +181,13 @@ def iter_DIE_children(self, die):
                 cur_offset = child._terminator.offset + child._terminator.size
     elftools.dwarf.compileunit.CompileUnit.iter_DIE_children = iter_DIE_children
 
+    # Fix for DW_FORM_strx
+    orig_create_structs = elftools.dwarf.dwarfinfo.DWARFStructs._create_structs
+    def _create_structs(self):
+        orig_create_structs(self)
+        self.Dwarf_dw_form['DW_FORM_strx'] = self.the_Dwarf_uleb128
+    elftools.dwarf.dwarfinfo.DWARFStructs._create_structs = _create_structs
+
     # Short out import directory parsing for now
     filebytes.pe.PE._parseDataDirectory = lambda self,a,b,c: None
 

setup.py

@@ -123,7 +123,7 @@ def run(self):
 
 setup(
     name='dwex',
-    version='4.55',  # Sync with version in __main__
+    version='4.56',  # Sync with version in __main__
     packages=['dwex'],
     url="https://github.com/sevaa/dwex/",
     entry_points={"gui_scripts": ["dwex = dwex.__main__:main"]},