commit 7c8008c0bd02e74ab60971ca9f6b37d82f110e56
author Jim Van Verth <jvanverth@google.com> Wed Feb 07 15:02:50 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 08 14:34:49 2018 +0000
tree 552bc2445b2392efb81634d3705eada7218e2a9c
parent 0b33cc42b480f06dc0c41805823e29c27b8d6813

Check for valid z-transform function in shadow generation

Bug: oss-fuzz:5630
Change-Id: I608a8a2db608396932eb732b8d7b61ab9fbcc322
Reviewed-on: https://skia-review.googlesource.com/105223
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/utils/SkShadowTessellator.cpp

diff --git a/src/utils/SkShadowTessellator.cpp b/src/utils/SkShadowTessellator.cpp
index 1a71407..11e8f2d 100755
--- a/src/utils/SkShadowTessellator.cpp
+++ b/src/utils/SkShadowTessellator.cpp
@@ -384,7 +384,9 @@
     // make sure we're not below the canvas plane
     this->setZOffset(path.getBounds(), ctm.hasPerspective());
 
-    this->setTransformedHeightFunc(ctm);
+    if (!this->setTransformedHeightFunc(ctm)) {
+        return;
+    }
 
     // Outer ring: 3*numPts
     // Middle ring: numPts
@@ -828,7 +830,9 @@
     SkMatrix fullTransform = SkMatrix::Concat(shadowTransform, ctm);
 
     // Set up our reverse mapping
-    this->setTransformedHeightFunc(fullTransform);
+    if (!this->setTransformedHeightFunc(fullTransform)) {
+        return;
+    }
 
     // TODO: calculate these reserves better
     // Penumbra ring: 3*numPts