diff options
| -rw-r--r-- | src/processor/minidump_processor.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc index d783654d..9d1279bf 100644 --- a/src/processor/minidump_processor.cc +++ b/src/processor/minidump_processor.cc @@ -79,6 +79,8 @@ ProcessState* MinidumpProcessor::Process(const string &minidump_file) { return NULL; } + MinidumpContext *context = thread->GetContext(); + if (process_state->crashed_ && thread->GetThreadID() == exception_thread_id) { if (found_crash_thread) { @@ -86,6 +88,13 @@ ProcessState* MinidumpProcessor::Process(const string &minidump_file) { return NULL; } + // Use the exception record's context for the crashed thread, instead + // of the thread's own context. For the crashed thread, the thread's + // own context is the state inside the exception handler. Using it + // would not result in the expected stack trace from the time of the + // crash. + context = exception->GetContext(); + process_state->crash_thread_ = thread_index; found_crash_thread = true; } @@ -96,7 +105,7 @@ ProcessState* MinidumpProcessor::Process(const string &minidump_file) { } scoped_ptr<Stackwalker> stackwalker( - Stackwalker::StackwalkerForCPU(exception->GetContext(), + Stackwalker::StackwalkerForCPU(context, thread_memory, dump.GetModuleList(), supplier_)); |