Merge pull request adafruit#749 from tannewt/analyze_heap_dump

dhalbert · web-flow · commit 3883a9fb7adf · 2018-04-09T20:35:34.000-04:00
Fix rom qstr pool length.
diff --git a/tools/analyze_heap_dump.py b/tools/analyze_heap_dump.py
@@ -56,8 +56,6 @@
               help="Draw the heap layout")
 @click.option("--draw-heap-ownership/--no-draw-heap-ownership", default=False,
               help="Draw the ownership graph of blocks on the heap")
-@click.option("--draw-heap-ownership/--no-draw-heap-ownership", default=False,
-              help="Draw the ownership graph of blocks on the heap")
 @click.option("--analyze-snapshots", default="last", type=click.Choice(['all', 'last']))
 def do_all_the_things(ram_filename, bin_filename, map_filename, print_block_contents,
                       print_unknown_types, print_block_state, print_conflicting_symbols,
@@ -352,7 +350,7 @@ def find_qstr(qstr_index):
                 else:
                     rom_offset = pool_ptr - rom_start
                     prev, total_prev_len, alloc, length = struct.unpack_from("<IIII", rom[rom_offset:rom_offset+32])
-                    pool = rom[rom_offset:rom_offset+length*4]
+                    pool = rom[rom_offset:rom_offset + 32 + length * 4]
 
                 if qstr_index >= total_prev_len:
                     offset = (qstr_index - total_prev_len) * 4 + 16
