src/effects/SkMergeImageFilter.cpp - Issue 23548034: Follow up to serialization validation code

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 23548034: Follow up to serialization validation code (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Merged in changes from 23021015 Created 7 years, 2 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/effects/SkMergeImageFilter.cpp

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

index a5c32acaf77b973aa729998a7d8c47f5dbbb17ea..4de1093612e1c7215412c3c2883a48839656ebf0 100755

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

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

@@ -161,7 +161,9 @@ SkMergeImageFilter::SkMergeImageFilter(SkFlattenableReadBuffer& buffer) : INHERI

if (hasModes) {

this->initAllocModes();

int nbInputs = countInputs();

- SkASSERT(buffer.getArrayCount() == nbInputs * sizeof(fModes[0]));

+ bool sizeMatches = buffer.getArrayCount() == nbInputs * sizeof(fModes[0]);

+ buffer.validate(sizeMatches);

+ SkASSERT(sizeMatches);

buffer.readByteArray(fModes);

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

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