commit f4aa1e66078907933662af468d474583133a8085
author Christopher Ferris <cferris@google.com> Tue Jan 23 20:10:27 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 23 20:10:27 2018 +0000
tree aa1e58fa8cb137e6f193f0d390f26e229a90ca66
parent d36b1d77679a52bc808df84f14c589216bf9e595
parent 954185cfcbdc4bc4dd7447aa33dba7d06581584a

Merge "Fix null ptr dereference if jit debug not enabled." am: b04bbccbb6
am: 67c7c1d911

Change-Id: I70f68f022f2dbf59078dfcb424fdd7c7f29ce402

libbacktrace/UnwindStack.cpp

diff --git a/libbacktrace/UnwindStack.cpp b/libbacktrace/UnwindStack.cpp
index bbfbdda..a748d1b 100644
--- a/libbacktrace/UnwindStack.cpp
+++ b/libbacktrace/UnwindStack.cpp
@@ -50,7 +50,9 @@
   auto process_memory = stack_map->process_memory();
   unwindstack::Unwinder unwinder(MAX_BACKTRACE_FRAMES + num_ignore_frames, stack_map->stack_maps(),
                                  regs, stack_map->process_memory());
-  unwinder.SetJitDebug(stack_map->GetJitDebug(), regs->Arch());
+  if (stack_map->GetJitDebug() != nullptr) {
+    unwinder.SetJitDebug(stack_map->GetJitDebug(), regs->Arch());
+  }
   unwinder.Unwind(skip_names, &stack_map->GetSuffixesToIgnore());
 
   if (num_ignore_frames >= unwinder.NumFrames()) {