src/core/SkScaledImageCache.cpp - Issue 361403006: Adding 64 bit checks

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

Issue 361403006: Adding 64 bit checks (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 6 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/SkScaledImageCache.cpp

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

index f266f97171533f3c3a66978f6a300520f3e085af..a030248197a391787c62e0b46f96fb9f199202a2 100644

--- a/src/core/SkScaledImageCache.cpp

+++ b/src/core/SkScaledImageCache.cpp

@@ -266,7 +266,8 @@ private:

bool SkScaledImageCacheDiscardableAllocator::allocPixelRef(SkBitmap* bitmap,

SkColorTable* ctable) {

size_t size = bitmap->getSize();

- if (0 == size) {

+ uint64_t size64 = bitmap->computeSize64();

+ if (0 == size || size64 > (uint64_t)size) {

return false;

}