chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc - Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/safe_browsing/incident_reporting/module_integrity_unittest_util_win.h ('k') | chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc

diff --git a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc

index 55ea230e501dd62138cc46cc81445985e9b9e18a..7bc3d33860655b4942f746c4774e5b06a7bed9b6 100644

--- a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc

+++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.cc

@@ -4,12 +4,15 @@

#include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h"

+#include <stddef.h>

#include <algorithm>

#include <string>

#include <vector>

#include "base/files/file_path.h"

#include "base/files/memory_mapped_file.h"

+#include "base/macros.h"

#include "base/metrics/sparse_histogram.h"

#include "base/scoped_native_library.h"

#include "base/strings/utf_string_conversions.h"

@@ -325,7 +328,7 @@ bool VerifyModule(

if (!mapped_module.Initialize(base::FilePath(module_path)))

return false;

ModuleVerificationState state(

- reinterpret_cast<HMODULE>(const_cast<uint8*>(mapped_module.data())));

+ reinterpret_cast<HMODULE>(const_cast<uint8_t*>(mapped_module.data())));

base::win::PEImage mem_peimage(module_handle);

if (!mem_peimage.VerifyMagic() || !state.disk_peimage.VerifyMagic())