src/core/SkMallocPixelRef.cpp - Issue 871993003: check for too-large rowBytes

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/SkMallocPixelRef.cpp

Issue 871993003: check for too-large rowBytes (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: use cast to keep minRB signed (matching the rest of the code) Created 5 years, 11 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/SkMallocPixelRef.cpp

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

index f4ba969662589131351aa7efa6141a1f9b53267b..12aa1f63d6197c1e189e6ca877df4b3d7694d923 100644

--- a/src/core/SkMallocPixelRef.cpp

+++ b/src/core/SkMallocPixelRef.cpp

@@ -56,8 +56,9 @@ SkMallocPixelRef* SkMallocPixelRef::NewAllocate(const SkImageInfo& info,

return NULL;

}

- int32_t minRB = SkToS32(info.minRowBytes());

- if (minRB < 0) {

+ // only want to permit 31bits of rowBytes

+ int64_t minRB = (int64_t)info.minRowBytes64();

+ if (minRB < 0 || !sk_64_isS32(minRB)) {

return NULL; // allocation will be too large

}

if (requestedRowBytes > 0 && (int32_t)requestedRowBytes < minRB) {

« no previous file with comments | « no previous file | tests/BitmapTest.cpp » ('j') | no next file with comments »