Merge SkMatrixConvolutionImageFilter fix to M40

Merging https://codereview.chromium.org/729583002/ to M40 as requested by the bug mentioned below.

BUG=433359
NOTRY=true

Review URL: https://codereview.chromium.org/803553004

1 files changed, 4 insertions, 0 deletions

diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index ae29bcb01..cdcf66f69 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -67,6 +67,10 @@ SkMatrixConvolutionImageFilter* SkMatrixConvolutionImageFilter::Create(
     if (!kernel) {
         return NULL;
     }
+    if ((kernelOffset.fX < 0) || (kernelOffset.fX >= kernelSize.fWidth) ||
+        (kernelOffset.fY < 0) || (kernelOffset.fY >= kernelSize.fHeight)) {
+        return NULL;
+    }
     return SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize, kernel, gain, bias,
                                                        kernelOffset, tileMode, convolveAlpha,
                                                        input, cropRect, uniqueID));