src/core/SkBitmap.cpp - Issue 951593002: Merging fix for 448423 into M41

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/core/SkBitmap.cpp

Issue 951593002: Merging fix for 448423 into M41 (Closed) Base URL: https://skia.googlesource.com/skia.git@m41

Patch Set: Created 5 years, 10 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/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp

index c962aea21a10fc3dd4e31705a9c334dcf83e450d..e77bbbd4e5e461cd6bd1030584ab1efd824b0ea8 100644

--- a/src/core/SkBitmap.cpp

+++ b/src/core/SkBitmap.cpp

@@ -1232,6 +1232,9 @@ bool SkBitmap::ReadRawPixels(SkReadBuffer* buffer, SkBitmap* bitmap) {

SkAutoTUnref<SkPixelRef> pr(SkMallocPixelRef::NewWithData(info, info.minRowBytes(),

ctable.get(), data.get()));

+ if (!pr.get()) {

+ return false;

+ }

bitmap->setInfo(pr->info());

bitmap->setPixelRef(pr, 0, 0);

return true;

« no previous file with comments | « no previous file | no next file » | no next file with comments »