Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Unified Diff: snapshot/win/thread_snapshot_win.cc

Issue 1364803004: win: Save contents of TEBs allowing !teb and !gle to work in windbg (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@dump-without-crashing
Patch Set: rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: snapshot/win/thread_snapshot_win.cc
diff --git a/snapshot/win/thread_snapshot_win.cc b/snapshot/win/thread_snapshot_win.cc
index ce4b309b9d97972fa529be6ac7383e546c2f4139..4093700b4a21349ee4ce94d7e52087e1f2ad50af 100644
--- a/snapshot/win/thread_snapshot_win.cc
+++ b/snapshot/win/thread_snapshot_win.cc
@@ -14,6 +14,8 @@
#include "snapshot/win/thread_snapshot_win.h"
+#include <vector>
+
#include "base/logging.h"
#include "snapshot/win/cpu_context_win.h"
#include "snapshot/win/process_reader_win.h"
@@ -22,7 +24,12 @@ namespace crashpad {
namespace internal {
ThreadSnapshotWin::ThreadSnapshotWin()
- : ThreadSnapshot(), context_(), stack_(), thread_(), initialized_() {
+ : ThreadSnapshot(),
+ context_(),
+ stack_(),
+ teb_(),
+ thread_(),
+ initialized_() {
}
ThreadSnapshotWin::~ThreadSnapshotWin() {
@@ -36,6 +43,7 @@ bool ThreadSnapshotWin::Initialize(
thread_ = process_reader_thread;
stack_.Initialize(
process_reader, thread_.stack_region_address, thread_.stack_region_size);
+ teb_.Initialize(process_reader, thread_.teb_address, thread_.teb_size);
#if defined(ARCH_CPU_X86_64)
if (process_reader->Is64Bit()) {
@@ -84,7 +92,14 @@ int ThreadSnapshotWin::Priority() const {
uint64_t ThreadSnapshotWin::ThreadSpecificDataAddress() const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
- return thread_.teb;
+ return thread_.teb_address;
+}
+
+std::vector<const MemorySnapshot*> ThreadSnapshotWin::ExtraMemory() const {
+ INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+ std::vector<const MemorySnapshot*> extra_memory;
Mark Mentovai 2015/10/01 20:28:05 (1, &teb_)
scottmg 2015/10/01 21:01:07 Done.
+ extra_memory.push_back(&teb_);
Mark Mentovai 2015/10/01 20:28:05 I’ll give you a pass on this for now, as long as y
scottmg 2015/10/01 21:01:07 I'm probably not fearful enough. Added TODO links.
+ return extra_memory;
}
} // namespace internal

Powered by Google App Engine
This is Rietveld 408576698