commit 5b9182959459e34fe0a5f64fbf4848e61e6dd33d
author Josh Gao <jmgao@google.com> Tue Aug 23 21:27:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 23 21:27:23 2016 +0000
tree a62dc430ab19fcd443f98aa02b843229befa11e7
parent 11f4e7912bcece1c135bb818d1cab40c5c9c56d1
parent 49667ed68668c03aec9bbd2e80e2493f7ccad32a

Merge "debuggerd: don't display fault addr for manually sent signals." am: ad52cbb9ec am: 504d4ccd7c
am: c8146aa39f

Change-Id: I792cceaf92e2d9865217a00f433fabf295c40035

debuggerd/tombstone.cpp

diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 9359678..a56f34d 100644
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -56,8 +56,13 @@
 #define TOMBSTONE_DIR   "/data/tombstones"
 #define TOMBSTONE_TEMPLATE (TOMBSTONE_DIR"/tombstone_%02d")
 
-static bool signal_has_si_addr(int sig) {
-  switch (sig) {
+static bool signal_has_si_addr(int si_signo, int si_code) {
+  // Manually sent signals won't have si_addr.
+  if (si_code == SI_USER || si_code == SI_QUEUE || si_code == SI_TKILL) {
+    return false;
+  }
+
+  switch (si_signo) {
     case SIGBUS:
     case SIGFPE:
     case SIGILL:
@@ -185,7 +190,7 @@
   }
 
   char addr_desc[32]; // ", fault addr 0x1234"
-  if (signal_has_si_addr(si.si_signo)) {
+  if (signal_has_si_addr(si.si_signo, si.si_code)) {
     snprintf(addr_desc, sizeof(addr_desc), "%p", si.si_addr);
   } else {
     snprintf(addr_desc, sizeof(addr_desc), "--------");
@@ -359,7 +364,7 @@
   siginfo_t si;
   memset(&si, 0, sizeof(si));
   if (ptrace(PTRACE_GETSIGINFO, tid, 0, &si) != -1) {
-    print_fault_address_marker = signal_has_si_addr(si.si_signo);
+    print_fault_address_marker = signal_has_si_addr(si.si_signo, si.si_code);
     addr = reinterpret_cast<uintptr_t>(si.si_addr);
   } else {
     ALOGE("Cannot get siginfo for %d: %s\n", tid, strerror(errno));