commit 5be805a5d96d927c5ce03ac89ad505ae71c73ab7
author Christopher Ferris <cferris@google.com> Tue Jan 23 14:58:09 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 23 14:58:09 2018 +0000
tree afb072913507b8feb73f51d42d8744a292ce139a
parent 14c6e7ddd551c127189416510ceb6e0fa4d92e15
parent 0da2cf166298e209cd54c03b3e33853377aabda7

Merge "Fix null ptr dereference if jit debug not enabled."

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