third_party/WebKit/Source/core/fetch/Resource.cpp - Issue 2173873003: Cancel image loads if decoding failed (attempt #2)

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: third_party/WebKit/Source/core/fetch/Resource.cpp

Issue 2173873003: Cancel image loads if decoding failed (attempt #2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: third_party/WebKit/Source/core/fetch/Resource.cpp

diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp

index 56714095d10e2511f46391547347091d1683cdaa..3c0259df274324b98495705f034833e988ce052f 100644

--- a/third_party/WebKit/Source/core/fetch/Resource.cpp

+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp

@@ -397,7 +397,8 @@ void Resource::error(const ResourceError& error)

if (m_error.isCancellation() || !isPreloaded())

memoryCache()->remove(this);

- setStatus(LoadError);

+ if (!errorOccurred())

+ setStatus(LoadError);

ASSERT(errorOccurred());

m_data.clear();

m_loader = nullptr;