chrome/common/safe_browsing/zip_analyzer.cc - Issue 683913009: Eliminate resource leaks from zip::ZipFiles and

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/common/safe_browsing/zip_analyzer.cc

Issue 683913009: Eliminate resource leaks from zip::ZipFiles and (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add test case, base::ScopedFD, comment for free() Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/common/safe_browsing/zip_analyzer.cc

diff --git a/chrome/common/safe_browsing/zip_analyzer.cc b/chrome/common/safe_browsing/zip_analyzer.cc

index 41894b82e1aad8be689ae82a60fd7b343998518b..44794d3b3673f902cd0886602fea7721ffee0f46 100644

--- a/chrome/common/safe_browsing/zip_analyzer.cc

+++ b/chrome/common/safe_browsing/zip_analyzer.cc

@@ -13,10 +13,7 @@ namespace zip_analyzer {

void AnalyzeZipFile(base::File zip_file, Results* results) {

zip::ZipReader reader;

- // OpenFromPlatformFile may close the handle even when it fails, but there is

- // no way to know if it did that or not. Assume it did (that's the common

- // case).

- if (!reader.OpenFromPlatformFile(zip_file.TakePlatformFile())) {

+ if (!reader.OpenFromPlatformFile(zip_file.GetPlatformFile())) {

VLOG(1) << "Failed to open zip file";

return;

}