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

Unified Diff: third_party/crashpad/crashpad/util/win/process_info.cc

Issue 1529483002: Update Crashpad to 583d1dc3efa96ea50f62afa69a598eeed1534edc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix GN build Created 5 years 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: third_party/crashpad/crashpad/util/win/process_info.cc
diff --git a/third_party/crashpad/crashpad/util/win/process_info.cc b/third_party/crashpad/crashpad/util/win/process_info.cc
index 2ac3a98bfacbe937f5bb60edda1e93bbb74c51be..5628e04b565e3358e657d3cc3585d585205d26b4 100644
--- a/third_party/crashpad/crashpad/util/win/process_info.cc
+++ b/third_party/crashpad/crashpad/util/win/process_info.cc
@@ -224,7 +224,7 @@ bool ReadProcessData(HANDLE process,
ProcessInfo* process_info) {
typename Traits::Pointer peb_address;
if (!AssignIfInRange(&peb_address, peb_address_vmaddr)) {
- LOG(ERROR) << base::StringPrintf("peb address 0x%x out of range",
+ LOG(ERROR) << base::StringPrintf("peb address 0x%llx out of range",
peb_address_vmaddr);
return false;
}
@@ -589,7 +589,8 @@ bool ProcessInfo::Modules(std::vector<Module>* modules) const {
return true;
}
-const std::vector<MEMORY_BASIC_INFORMATION64>& ProcessInfo::MemoryInfo() const {
+const ProcessInfo::MemoryBasicInformation64Vector& ProcessInfo::MemoryInfo()
+ const {
INITIALIZATION_STATE_DCHECK_VALID(initialized_);
return memory_info_;
}
@@ -629,11 +630,11 @@ const std::vector<ProcessInfo::Handle>& ProcessInfo::Handles() const {
std::vector<CheckedRange<WinVMAddress, WinVMSize>> GetReadableRangesOfMemoryMap(
const CheckedRange<WinVMAddress, WinVMSize>& range,
- const std::vector<MEMORY_BASIC_INFORMATION64>& memory_info) {
+ const ProcessInfo::MemoryBasicInformation64Vector& memory_info) {
using Range = CheckedRange<WinVMAddress, WinVMSize>;
// Find all the ranges that overlap the target range, maintaining their order.
- std::vector<MEMORY_BASIC_INFORMATION64> overlapping;
+ ProcessInfo::MemoryBasicInformation64Vector overlapping;
for (const auto& mi : memory_info) {
static_assert(base::is_same<decltype(mi.BaseAddress), WinVMAddress>::value,
"expected range address to be WinVMAddress");
« no previous file with comments | « third_party/crashpad/crashpad/util/win/process_info.h ('k') | third_party/crashpad/crashpad/util/win/process_info_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698