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

Issue 23548034: Follow up to serialization validation code (Closed) Base URL: https://skia.googlecode.com/svn/trunk

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

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

index 5d5f29058b705a704053d3c1873a81286e1f2cf9..b44505d556c22948a6f2b89a5976a042addbce51 100644

--- a/src/effects/SkMorphologyImageFilter.cpp

+++ b/src/effects/SkMorphologyImageFilter.cpp

@@ -24,9 +24,7 @@ SkMorphologyImageFilter::SkMorphologyImageFilter(SkFlattenableReadBuffer& buffer

: INHERITED(buffer) {

fRadius.fWidth = buffer.readInt();

fRadius.fHeight = buffer.readInt();

- buffer.validate(SkScalarIsFinite(SkIntToScalar(fRadius.fWidth)) &&

- SkScalarIsFinite(SkIntToScalar(fRadius.fHeight)) &&

- (fRadius.fWidth >= 0) &&

+ buffer.validate((fRadius.fWidth >= 0) &&

(fRadius.fHeight >= 0));

}