Fixes

Author: sevaa

dwex/__main__.py

@@ -19,7 +19,7 @@
 from .treedlg import TreeDlg
 
 # Sync with version in setup.py
-version = (4, 48)
+version = (4, 49)
 the_app = None
 
 # TODO:
@@ -397,28 +397,29 @@ def on_switchslice(self):
 
     # Index is a tree index - the DIE is the data object within
     def display_die(self, index):
-        die = index.internalPointer()
-        die_table = self.die_table
-        if not self.die_model:
-            self.die_model = DIETableModel(die, self.prefix, self.lowlevel, self.hex, self.dwarfregnames)
-            die_table.setModel(self.die_model)
-            die_table.selectionModel().currentChanged.connect(self.on_attribute_selection)
-        else:
-            self.die_model.display_DIE(die)
-        self.die_table.resizeColumnsToContents()
-        self.details_table.setModel(None)
-        self.followref_menuitem.setEnabled(False)
-        self.followref_tbitem.setEnabled(False)
-        self.cuproperties_menuitem.setEnabled(True)
-        self.die_table.setCurrentIndex(QModelIndex()) # Will cause on_attribute_selection
-
-        #TODO: resize the attribute table vertically dynamically
-        #attr_count = self.die_model.rowCount(None)
-        #die_table.resize(die_table.size().width(),
-        #    die_table.rowViewportPosition(attr_count-1) + 
-        #        die_table.rowHeight(attr_count-1) +
-        #        die_table.horizontalHeader().size().height() + 1 + attr_count)
-        #self.rpane_layout.update()
+        if self.details_table and self.die_table: # Short out for #1753
+            die = index.internalPointer()
+            die_table = self.die_table
+            if not self.die_model:
+                self.die_model = DIETableModel(die, self.prefix, self.lowlevel, self.hex, self.dwarfregnames)
+                die_table.setModel(self.die_model)
+                die_table.selectionModel().currentChanged.connect(self.on_attribute_selection)
+            else:
+                self.die_model.display_DIE(die)
+            self.die_table.resizeColumnsToContents()
+            self.details_table.setModel(None)
+            self.followref_menuitem.setEnabled(False)
+            self.followref_tbitem.setEnabled(False)
+            self.cuproperties_menuitem.setEnabled(True)
+            self.die_table.setCurrentIndex(QModelIndex()) # Will cause on_attribute_selection
+
+            #TODO: resize the attribute table vertically dynamically
+            #attr_count = self.die_model.rowCount(None)
+            #die_table.resize(die_table.size().width(),
+            #    die_table.rowViewportPosition(attr_count-1) + 
+            #        die_table.rowHeight(attr_count-1) +
+            #        die_table.horizontalHeader().size().height() + 1 + attr_count)
+            #self.rpane_layout.update()
 
     # Invoked for tree clicks and keyboard navigation, ref follow, back-forward
     def on_tree_selection(self, index, prev = None):

dwex/crash.py

@@ -70,6 +70,12 @@ def make_exc_report(exc, tb, version, catchpoint, ctxt=None):
     report += "DWEX " + '.'.join(str(v) for v in version) + "\n"
     report += "Python " + sys.version + "\n"
     report += "System: " + platform.platform() + "\n"
+    try:
+        import elftools
+        if hasattr(elftools, '__version__'):
+            report += "Pyelftools: " + elftools.__version__ + "\n"
+    except ImportError:
+        pass
     if _binary_desc:
         report += "Binary: " + _binary_desc + "\n"
     try:

dwex/patch.py

@@ -8,6 +8,7 @@
 import elftools.dwarf.dwarf_expr
 import elftools.dwarf.locationlists
 import elftools.elf.elffile
+import elftools.elf.dynamic
 import elftools.dwarf.dwarfinfo
 import filebytes.mach_o
 import filebytes.pe
@@ -17,7 +18,7 @@
 from elftools.dwarf.dwarfinfo import DebugSectionDescriptor
 from elftools.elf.relocation import RelocationHandler
 from elftools.elf.sections import Section
-from elftools.elf.dynamic import DynamicSection, Dynamic
+from elftools.elf.dynamic import Dynamic
 from elftools.dwarf.locationlists import LocationLists, LocationListsPair
 from elftools.construct.core import StaticField
 from filebytes.mach_o import LSB_64_Section, MH, SectionData, LoadCommand, LoadCommandData, LC
@@ -105,7 +106,7 @@ def DynamicSection_init(self, header, name, elffile):
         stringtable = elffile.get_section(header['sh_link'], ('SHT_STRTAB', 'SHT_NOBITS', 'SHT_NULL'))
         Dynamic.__init__(self, self.stream, self.elffile, stringtable,
             self['sh_offset'], self['sh_type'] == 'SHT_NOBITS')
-    DynamicSection.__init__ = DynamicSection_init
+    elftools.elf.dynamic.DynamicSection.__init__ = DynamicSection_init
 
     # 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.48',  # Sync with version in __main__
+    version='4.49',  # Sync with version in __main__
     packages=['dwex'],
     url="https://github.com/sevaa/dwex/",
     entry_points={"gui_scripts": ["dwex = dwex.__main__:main"]},