| Index: src/effects/SkMatrixConvolutionImageFilter.cpp
|
| diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
|
| index 3da27cef26e1b5697d37f094baa5428b44a2ef1c..eeea494fd3f1b7145b125b3d47f20756c7f223f6 100644
|
| --- a/src/effects/SkMatrixConvolutionImageFilter.cpp
|
| +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
|
| @@ -82,7 +82,8 @@ SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(SkFlattenableRead
|
| fTarget.fY = buffer.readInt();
|
| fTileMode = (TileMode) buffer.readInt();
|
| fConvolveAlpha = buffer.readBool();
|
| - buffer.validate((fKernel != 0) &&
|
| + buffer.validate(buffer.validate(true) &&
|
| + (fKernel != 0) &&
|
| SkScalarIsFinite(fGain) &&
|
| SkScalarIsFinite(fBias) &&
|
| tile_mode_is_valid(fTileMode));
|
|
|