From 2486d5a10d01d9427f86f02a33ddb9a49ce671f5 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Mon, 22 Jan 2018 17:37:59 -0800 Subject: Fix null ptr dereference if jit debug not enabled. Test: No crash when a jit debug object is not instantiated. Change-Id: Ic4350a10258459ead7c5679ceb84372f1084f0ad --- libbacktrace/UnwindStack.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libbacktrace') diff --git a/libbacktrace/UnwindStack.cpp b/libbacktrace/UnwindStack.cpp index bbfbddaa8..a748d1b4f 100644 --- a/libbacktrace/UnwindStack.cpp +++ b/libbacktrace/UnwindStack.cpp @@ -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()) { -- cgit v1.2.3