third_party/WebKit/Source/core/frame/ImageBitmap.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/frame/ImageBitmap.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/fetch/Resource.cpp ('k') | third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/ImageBitmap.cpp

diff --git a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp

index d614506a5ab4cdfd4d50a589b35002bd0e239507..fcd05fb75be065421b367dc7fed7491c7cc093b8 100644

--- a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp

+++ b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp

@@ -220,7 +220,8 @@ static PassRefPtr<StaticBitmapImage> cropImage(Image* image, const ParsedOptions

RefPtr<SkImage> skiaImage = image->imageForCurrentFrame();

// Attempt to get raw unpremultiplied image data, executed only when skiaImage is premultiplied.

if ((((!parsedOptions.premultiplyAlpha && !skiaImage->isOpaque()) || !skiaImage) && image->data() && imageFormat == PremultiplyAlpha) || colorSpaceOp == ImageDecoder::GammaAndColorProfileIgnored) {

- std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(*(image->data()),

+ std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(

+ ImageDecoder::determineImageType(*(image->data())),

parsedOptions.premultiplyAlpha ? ImageDecoder::AlphaPremultiplied : ImageDecoder::AlphaNotPremultiplied,

colorSpaceOp));

if (!decoder)