yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-08-04 10:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the correct PC when determining whether to skip storing a stack.

Browse source 
This addresses a bug in commit 049a1532 that meant that the PC of the
crashing thread was always used to determine whether to include a stack,
instead of using the PC of the thread in question.

BUG=664460

Change-Id: Idcbd5db751e5c00941a1be28607389961c0c75d7
Reviewed-on: https://chromium-review.googlesource.com/446499
Reviewed-by: Robert Sesek <rsesek@chromium.org>
This commit is contained in:
Tobias Sargeant 2017-02-23 14:08:54 +00:00 committed by Tobias Sargeant
parent 4e82b6fa11
commit 4af8174278
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/client/linux/minidump_writer/minidump_writer.cc
View file

@ -273,7 +273,7 @@ class MinidumpWriter {
} }
bool FillThreadStack(MDRawThread* thread, uintptr_t stack_pointer, bool FillThreadStack(MDRawThread* thread, uintptr_t stack_pointer,
int max_stack_len, uint8_t** stack_copy) { uintptr_t pc, int max_stack_len, uint8_t** stack_copy) {
*stack_copy = NULL; *stack_copy = NULL;
const void* stack; const void* stack;
size_t stack_len; size_t stack_len;
@ -309,7 +309,6 @@ class MinidumpWriter {
} }
uintptr_t low_addr = principal_mapping->system_mapping_info.start_addr; uintptr_t low_addr = principal_mapping->system_mapping_info.start_addr;
uintptr_t high_addr = principal_mapping->system_mapping_info.end_addr; uintptr_t high_addr = principal_mapping->system_mapping_info.end_addr;
uintptr_t pc = UContextReader::GetInstructionPointer(ucontext_);
if ((pc < low_addr || pc > high_addr) && if ((pc < low_addr || pc > high_addr) &&
!dumper_->StackHasPointerToMapping(*stack_copy, stack_len, !dumper_->StackHasPointerToMapping(*stack_copy, stack_len,
stack_pointer_offset, stack_pointer_offset,
@ -376,7 +375,9 @@ class MinidumpWriter {
!dumper_->IsPostMortem()) { !dumper_->IsPostMortem()) {
uint8_t* stack_copy; uint8_t* stack_copy;
const uintptr_t stack_ptr = UContextReader::GetStackPointer(ucontext_); const uintptr_t stack_ptr = UContextReader::GetStackPointer(ucontext_);
if (!FillThreadStack(&thread, stack_ptr, -1, &stack_copy)) if (!FillThreadStack(&thread, stack_ptr,
UContextReader::GetInstructionPointer(ucontext_),
-1, &stack_copy))
return false; return false;
// Copy 256 bytes around crashing instruction pointer to minidump. // Copy 256 bytes around crashing instruction pointer to minidump.
@ -442,8 +443,9 @@ class MinidumpWriter {
int max_stack_len = -1; // default to no maximum for this thread int max_stack_len = -1; // default to no maximum for this thread
if (minidump_size_limit_ >= 0 && i >= kLimitBaseThreadCount) if (minidump_size_limit_ >= 0 && i >= kLimitBaseThreadCount)
max_stack_len = extra_thread_stack_len; max_stack_len = extra_thread_stack_len;
if (!FillThreadStack(&thread, info.stack_pointer, max_stack_len, if (!FillThreadStack(&thread, info.stack_pointer,
&stack_copy)) info.GetInstructionPointer(), max_stack_len,
&stack_copy))
return false; return false;
TypedMDRVA<RawContextCPU> cpu(&minidump_writer_); TypedMDRVA<RawContextCPU> cpu(&minidump_writer_);