third_party/WebKit/Source/modules/notifications/NotificationImageLoader.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/modules/notifications/NotificationImageLoader.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp ('k') | third_party/WebKit/Source/platform/exported/WebImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

diff --git a/third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp b/third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

index 3b545f91f2577502b343627e72aa6655a63a638c..298931c6c9cc0bdeeace13f2f9ff74390874b9ba 100644

--- a/third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

+++ b/third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

@@ -94,7 +94,7 @@ void NotificationImageLoader::didFinishLoading(unsigned long resourceIdentifier,

DEFINE_THREAD_SAFE_STATIC_LOCAL(CustomCountHistogram, fileSizeHistogram, new CustomCountHistogram("Notifications.Icon.FileSize", 1, 10000000 /* ~10mb max */, 50 /* buckets */));

fileSizeHistogram.count(m_data->size());

- std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(*m_data.get(), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);

+ std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(ImageDecoder::determineImageType(*m_data.get()), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);

if (decoder) {

decoder->setData(m_data.get(), true /* allDataReceived */);

// The |ImageFrame*| is owned by the decoder.