third_party/WebKit/Source/platform/graphics/PictureSnapshot.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/PictureSnapshot.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/platform/graphics/PictureSnapshot.cpp

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

index 8cc9f53a6929b0de30319d55d54a03e4150d3c39..cdf740b2784d59b9517c74e35652de7ef4f8c156 100644

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

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

@@ -60,7 +60,7 @@ PictureSnapshot::PictureSnapshot(PassRefPtr<const SkPicture> picture)

static bool decodeBitmap(const void* data, size_t length, SkBitmap* result)

{

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

+ std::unique_ptr<ImageDecoder> imageDecoder = ImageDecoder::create(ImageDecoder::determineImageType(static_cast<const char*>(data), length),

ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileIgnored);

if (!imageDecoder)

return false;