chrome/utility/safe_browsing/mac/hfs.cc - Issue 2141963002: Validate safe_browsing::dmg::UDIFBlock data before attempting to read at its offsets.

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/utility/safe_browsing/mac/hfs.cc

Issue 2141963002: Validate safe_browsing::dmg::UDIFBlock data before attempting to read at its offsets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments Created 4 years, 5 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: chrome/utility/safe_browsing/mac/hfs.cc

diff --git a/chrome/utility/safe_browsing/mac/hfs.cc b/chrome/utility/safe_browsing/mac/hfs.cc

index f984636e316bed050ea7008111aaf336c14844c7..9a27223be375a2cc0455541c930eff3ffb27d15e 100644

--- a/chrome/utility/safe_browsing/mac/hfs.cc

+++ b/chrome/utility/safe_browsing/mac/hfs.cc

@@ -369,7 +369,10 @@ bool HFSForkReadStream::Read(uint8_t* buffer,

// Read the entire extent now, to avoid excessive seeking and re-reading.

if (!read_current_extent_) {

- hfs_->SeekToBlock(extent->startBlock);

+ if (!hfs_->SeekToBlock(extent->startBlock)) {

+ DLOG(ERROR) << "Failed to seek to block " << extent->startBlock;

+ return false;

+ }

current_extent_data_.resize(extent_size.ValueOrDie());

if (!hfs_->stream()->ReadExact(&current_extent_data_[0],

extent_size.ValueOrDie())) {

« no previous file with comments | « no previous file | chrome/utility/safe_browsing/mac/udif.h » ('j') | no next file with comments »