src/images/SkImageDecoder_libwebp.cpp - Issue 510423005: make allocPixels throw on failure

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: src/images/SkImageDecoder_libwebp.cpp

Issue 510423005: make allocPixels throw on failure (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: can't use (void) to suppress the "must check return result" Created 6 years, 3 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: src/images/SkImageDecoder_libwebp.cpp

diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp

index f7cfa8b4cca4937f15a549cdd27ea4040f07e8dd..f32587ddcc2427c1e3630cd5285f1049aaf71224 100644

--- a/src/images/SkImageDecoder_libwebp.cpp

+++ b/src/images/SkImageDecoder_libwebp.cpp

@@ -375,7 +375,7 @@ bool SkWEBPImageDecoder::onDecodeSubset(SkBitmap* decodedBitmap,

// alloc from native heap if it is a temp bitmap. (prevent GC)

bool allocResult = (bitmap == decodedBitmap)

? allocPixelRef(bitmap, NULL)

- : bitmap->allocPixels();

+ : bitmap->tryAllocPixels();

if (!allocResult) {

return return_false(*decodedBitmap, "allocPixelRef");

}