mirror of
https://github.com/chromium/crashpad.git
synced 2025-03-09 22:26:06 +00:00
d3b7463c7a
This was previously proposed at https://chromium-review.googlesource.com/c/crashpad/crashpad/+/339103/2/util/win/pe_image_reader_test.cc#84. It didn’t land because the change was abandoned for other reasons, but the fix was valid. nsi.dll is not VFT_APP or VFT_DLL, and if it’s loaded, crashpad_snapshot_test PEImageReader.VSFixedFileInfo_AllModules fails. Although I can’t reproduce nsi.dll being loaded spontaneously in local testing or on trybots, it occurred in the monolithic crashpad_tests at https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/64492: [ RUN ] PEImageReader.VSFixedFileInfo_AllModules ../../third_party/crashpad/crashpad/snapshot/win/pe_image_reader_test.cc(90): error: Value of: observed.dwFileType == VFT_APP || observed.dwFileType == VFT_DLL Actual: false Expected: true Google Test trace: ../../third_party/crashpad/crashpad/snapshot/win/pe_image_reader_test.cc(164): C:\Windows\syswow64\NSI.dll [ FAILED ] PEImageReader.VSFixedFileInfo_AllModules (11 ms) I can also reproduce locally by calling LoadLibrary(L"nsi.dll"). Bug: chromium:779790, chromium:782011 Test: crashpad_snapshot_test PEImageReader.VSFixedFileInfo_AllModules Change-Id: I361c7d6521645913277a441ce38779aaa4a182c2 Reviewed-on: https://chromium-review.googlesource.com/757077 Reviewed-by: Scott Graham <scottmg@chromium.org> Commit-Queue: Mark Mentovai <mark@chromium.org>