3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2024-12-31 01:43:03 +08:00
Code Issues Projects Releases Wiki Activity

Build fixes for Clang on Windows

Browse Source 
See e.g. http://build.chromium.org/p/chromium.fyi/builders/CrWinClang/builds/4502/steps/compile/logs/stdio

BUG=chromium:82385
R=mark@chromium.org

Review URL: https://codereview.chromium.org/1473073008 .

Patch from Hans Wennborg <hans@chromium.org>.
This commit is contained in:
Hans Wennborg 2015-11-25 23:50:31 -05:00 committed by Mark Mentovai
parent 9b92d2fb71
commit 33414779e1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snapshot/win/pe_image_reader.cc
View File

@ -86,8 +86,10 @@ bool PEImageReader::GetCrashpadInfo(
INITIALIZATION_STATE_DCHECK_VALID(initialized_); INITIALIZATION_STATE_DCHECK_VALID(initialized_);
IMAGE_SECTION_HEADER section; IMAGE_SECTION_HEADER section;
if (!GetSectionByName<NtHeadersForTraits<Traits>::type>("CPADinfo", &section)) if (!GetSectionByName<typename NtHeadersForTraits<Traits>::type>("CPADinfo",
&section)) {
return false; return false;
}
if (section.Misc.VirtualSize < sizeof(process_types::CrashpadInfo<Traits>)) { if (section.Misc.VirtualSize < sizeof(process_types::CrashpadInfo<Traits>)) {
LOG(WARNING) << "small crashpad info section size " LOG(WARNING) << "small crashpad info section size "

4
snapshot/win/process_snapshot_win.cc
View File

@ -380,9 +380,9 @@ void ProcessSnapshotWin::AddMemorySnapshotForLdrLIST_ENTRY(
PointerVector<internal::MemorySnapshotWin>* into) { PointerVector<internal::MemorySnapshotWin>* into) {
// Walk the doubly-linked list of entries, adding the list memory itself, as // Walk the doubly-linked list of entries, adding the list memory itself, as
// well as pointed-to strings. // well as pointed-to strings.
Traits::Pointer last = le.Blink; typename Traits::Pointer last = le.Blink;
process_types::LDR_DATA_TABLE_ENTRY<Traits> entry; process_types::LDR_DATA_TABLE_ENTRY<Traits> entry;
Traits::Pointer cur = le.Flink; typename Traits::Pointer cur = le.Flink;
for (;;) { for (;;) {
// |cur| is the pointer to LIST_ENTRY embedded in the LDR_DATA_TABLE_ENTRY. // |cur| is the pointer to LIST_ENTRY embedded in the LDR_DATA_TABLE_ENTRY.
// So we need to offset back to the beginning of the structure. // So we need to offset back to the beginning of the structure.