LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Prevent "index out of range" crash when addr2line aborts in between"

Browse Source
This commit is contained in:
Mathieu Chartier
2018-10-09 17:04:08 +00:00
committed by Gerrit Code Review
parent c5e05f9d7b 7e73f7a7b4
commit 076bd27d03
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/native_heapdump_viewer.py
View File

@@ -16,6 +16,7 @@
"""Generates a human-interpretable view of a native heap dump from 'am dumpheap -n'.""" """Generates a human-interpretable view of a native heap dump from 'am dumpheap -n'."""
import logging
import os import os
import os.path import os.path
import re import re
@@ -320,11 +321,18 @@ def ResolveAddrs(html_output, symboldir, app_symboldir, backtraces, mappings):
p = subprocess.Popen(["addr2line", "-C", "-j", ".text", "-e", sofile, "-f"], stdout=subprocess.PIPE, stdin=subprocess.PIPE) p = subprocess.Popen(["addr2line", "-C", "-j", ".text", "-e", sofile, "-f"], stdout=subprocess.PIPE, stdin=subprocess.PIPE)
result = p.communicate(input_addrs)[0] result = p.communicate(input_addrs)[0]
addr2line_rc = p.returncode
if addr2line_rc and (addr2line_rc < 0):
logging.warn("addr2line on " + sofile + " terminated by signal " + str(-1 * addr2line_rc))
splitted = result.split("\n") splitted = result.split("\n")
for x in range(0, len(addrs_by_lib[lib])): for x in range(0, len(addrs_by_lib[lib])):
function = splitted[2*x]; try:
location = splitted[2*x+1]; function = splitted[2*x];
resolved_addrs[addrs_by_lib[lib][x]] = FrameDescription(function, location, lib) location = splitted[2*x+1];
resolved_addrs[addrs_by_lib[lib][x]] = FrameDescription(function, location, lib)
except Exception:
logging.warn("exception while resolving symbols", exc_info=True)
resolved_addrs[addrs_by_lib[lib][x]] = FrameDescription("---", "---", lib)
else: else:
if html_output == False: if html_output == False:
print "%s not found for symbol resolution" % lib print "%s not found for symbol resolution" % lib