third_party/WebKit/Source/platform/exported/WebImage.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/platform/exported/WebImage.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/modules/notifications/NotificationImageLoader.cpp ('k') | third_party/WebKit/Source/platform/graphics/BitmapImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/exported/WebImage.cpp

diff --git a/third_party/WebKit/Source/platform/exported/WebImage.cpp b/third_party/WebKit/Source/platform/exported/WebImage.cpp

index 31dc8d773dd41064fa622e0c7da6d4b1ac71b053..d4b14e300c3491b823cb21bf9e03749feae2f3f4 100644

--- a/third_party/WebKit/Source/platform/exported/WebImage.cpp

+++ b/third_party/WebKit/Source/platform/exported/WebImage.cpp

@@ -46,7 +46,7 @@ namespace blink {

WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize)

{

RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);

- std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(*buffer.get(), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored));

+ std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(ImageDecoder::determineImageType(*buffer.get()), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored));

if (!decoder)

return WebImage();

@@ -90,7 +90,7 @@ WebVector<WebImage> WebImage::framesFromData(const WebData& data)

const size_t maxFrameCount = 8;

RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);

- std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(*buffer.get(), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored));

+ std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(ImageDecoder::determineImageType(*buffer.get()), ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored));

if (!decoder)

return WebVector<WebImage>();