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

This commit is contained in:
Christopher Ferris 2018-01-23 14:58:09 +00:00 committed by Gerrit Code Review
commit b04bbccbb6
1 changed files with 3 additions and 1 deletions

View File

@ -50,7 +50,9 @@ bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map,
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()) {