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

Index: third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp b/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp

index bfe12625d9b40fd24892e7c195c3c23689a6a498..9bff3199a6bb5958545553d058e49316cc0b15ec 100644

--- a/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp

+++ b/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp

@@ -122,7 +122,7 @@ SkImageGenerator* DecodingImageGenerator::create(SkData* data)

{

// We just need the size of the image, so we have to temporarily create an ImageDecoder. Since

// we only need the size, it doesn't really matter about premul or not, or gamma settings.

- std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(static_cast<const char*>(data->data()), data->size(),

+ std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(ImageDecoder::determineImageType(static_cast<const char*>(data->data()), data->size()),

ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);

if (!decoder)

return 0;