commit 36ae61493eae2c2e8a08ff8bc1d37d7e4ba31219
author Christopher Ferris <cferris@google.com> Tue Jan 23 21:08:48 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 23 21:08:48 2018 +0000
tree 3e399a86349379fcb88c4c28531248785063f953
parent c50646322801e74381f0d351a8d3058a008f41fc
parent f4aa1e66078907933662af468d474583133a8085

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

Change-Id: I3b2868820ccb59e6fd5c3d6df88934b4f77281a4

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()) {