3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-17 16:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fuchsia] Always initialize

Browse Source 
We occassionally see UB here that looks like context_.architecture isn't
initialized.

Note to reviewers: needs a test. Guidance on where/how to write one
would be most welcome.

Bug: fuchsia:55587
Change-Id: I886972e4d3a5c1e0c53eb17f3f65dada47a84115
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2281881
Reviewed-by: Mark Mentovai <mark@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
This commit is contained in:
Tamir Duberstein 2020-07-05 09:11:07 -04:00 committed by Commit Bot
parent e46f30cc54
commit d2c22d6b4b
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
snapshot/fuchsia/exception_snapshot_fuchsia.cc
View File

@ -54,23 +54,28 @@ void ExceptionSnapshotFuchsia::Initialize(
codes_.push_back(exception_report.context.arch.u.arm_64.far); codes_.push_back(exception_report.context.arch.u.arm_64.far);
#endif #endif
for (const auto& t : process_reader->Threads()) { const auto threads = process_reader->Threads();
if (t.id == thread_id) { const auto& t =
std::find_if(threads.begin(),
threads.end(),
[thread_id](const ProcessReaderFuchsia::Thread& thread) {
return thread.id == thread_id;
});
if (t != threads.end()) {
#if defined(ARCH_CPU_X86_64) #if defined(ARCH_CPU_X86_64)
context_.architecture = kCPUArchitectureX86_64; context_.architecture = kCPUArchitectureX86_64;
context_.x86_64 = &context_arch_; context_.x86_64 = &context_arch_;
// TODO(fuchsia/DX-642): Add float context once saved in |t|. // TODO(fxbug.dev/5496): Add float context once saved in |t|.
InitializeCPUContextX86_64_NoFloatingPoint(t.general_registers, InitializeCPUContextX86_64_NoFloatingPoint(t->general_registers,
context_.x86_64); context_.x86_64);
#elif defined(ARCH_CPU_ARM64) #elif defined(ARCH_CPU_ARM64)
context_.architecture = kCPUArchitectureARM64; context_.architecture = kCPUArchitectureARM64;
context_.arm64 = &context_arch_; context_.arm64 = &context_arch_;
InitializeCPUContextARM64( InitializeCPUContextARM64(
t.general_registers, t.vector_registers, context_.arm64); t->general_registers, t->vector_registers, context_.arm64);
#else #else
#error Port. #error Port.
#endif #endif
}
} }
if (context_.InstructionPointer() != 0 && if (context_.InstructionPointer() != 0 &&
@ -83,6 +88,8 @@ void ExceptionSnapshotFuchsia::Initialize(
exception_address_ = exception_report.context.arch.u.x86_64.cr2; exception_address_ = exception_report.context.arch.u.x86_64.cr2;
#elif defined(ARCH_CPU_ARM64) #elif defined(ARCH_CPU_ARM64)
exception_address_ = exception_report.context.arch.u.arm_64.far; exception_address_ = exception_report.context.arch.u.arm_64.far;
#else
#error Port.
#endif #endif
} }

2
snapshot/fuchsia/exception_snapshot_fuchsia.h
View File

@ -63,7 +63,7 @@ class ExceptionSnapshotFuchsia final : public ExceptionSnapshot {
#elif defined(ARCH_CPU_ARM64) #elif defined(ARCH_CPU_ARM64)
CPUContextARM64 context_arch_; CPUContextARM64 context_arch_;
#endif #endif
CPUContext context_; CPUContext context_ = {};
std::vector<uint64_t> codes_; std::vector<uint64_t> codes_;
zx_koid_t thread_id_; zx_koid_t thread_id_;
zx_vaddr_t exception_address_; zx_vaddr_t exception_address_;