src/effects/SkMergeImageFilter.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/effects/SkMergeImageFilter.cpp

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

Patch Set: Changed isAvailable for validateAvailable 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/effects/SkMergeImageFilter.cpp

diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp

index 33673b063927a249b89c77cefcac88e43d869a88..528fe823ebf7cdb6a3800f6fee31e7a0d9d1e476 100755

--- a/src/effects/SkMergeImageFilter.cpp

+++ b/src/effects/SkMergeImageFilter.cpp

@@ -165,7 +165,8 @@ SkMergeImageFilter::SkMergeImageFilter(SkFlattenableReadBuffer& buffer)

int nbInputs = countInputs();

size_t size = nbInputs * sizeof(fModes[0]);

SkASSERT(buffer.getArrayCount() == size);

- if (buffer.readByteArray(fModes, size)) {

+ if (buffer.validate(buffer.getArrayCount() == size) &&

+ buffer.readByteArray(fModes, size)) {

for (int i = 0; i < nbInputs; ++i) {

buffer.validate(SkIsValidMode((SkXfermode::Mode)fModes[i]));

}