Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acebf4f1 authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

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

am: 67c7c1d9

Change-Id: I70f68f022f2dbf59078dfcb424fdd7c7f29ce402
parents 41fe1b5e 67c7c1d9

libbacktrace/UnwindStack.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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());

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