src/images/SkImageRef.cpp - Issue 116773002: Fixed more fuzzer issues

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

Issue 116773002: Fixed more fuzzer issues (Closed) Base URL: https://skia.googlesource.com/skia.git@master

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

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

index 716519f080d0ab8e2f9d2dc964b73eb80224406b..f80247848de58db1d70331244fdb385715e61ebd 100644

--- a/src/images/SkImageRef.cpp

+++ b/src/images/SkImageRef.cpp

@@ -165,8 +165,12 @@ SkImageRef::SkImageRef(SkFlattenableReadBuffer& buffer, SkBaseMutex* mutex)

fDoDither = buffer.readBool();

size_t length = buffer.getArrayCount();

- fStream = SkNEW_ARGS(SkMemoryStream, (length));

- buffer.readByteArray((void*)fStream->getMemoryBase(), length);

+ if (buffer.validate(buffer.isAvailable(length))) {

+ fStream = SkNEW_ARGS(SkMemoryStream, (length));

+ buffer.readByteArray((void*)fStream->getMemoryBase(), length);

+ } else {

+ fStream = NULL;

+ }

fPrev = fNext = NULL;

fFactory = NULL;