commit ba5b5f5171680701d27c68f13e378eb5d539ae07
author Mike Reed <reed@google.com> Fri May 18 16:29:11 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri May 18 21:03:54 2018 +0000
tree 313f7be6f62546805636391584aef8984626d0c6
parent 5699278b679f27e1426ff1867807d689f0e806d4

harden line2d effect

Suggested by https://fuzzer.skia.org/category/n32_canvas/file/c3JjL2NvcmUvU2tTdHJva2UuY3Bw?

Bug: skia:
Change-Id: I8ec48f844bfa5d063f0ab1bdfe0612ec4673ada3
Reviewed-on: https://skia-review.googlesource.com/129260
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Mike Reed <reed@google.com>

include/effects/Sk2DPathEffect.h

diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h
index 5b7df35..5ebadab 100644
--- a/include/effects/Sk2DPathEffect.h
+++ b/include/effects/Sk2DPathEffect.h
@@ -56,6 +56,9 @@
 class SK_API SkLine2DPathEffect : public Sk2DPathEffect {
 public:
     static sk_sp<SkPathEffect> Make(SkScalar width, const SkMatrix& matrix) {
+        if (!(width >= 0)) {
+            return nullptr;
+        }
         return sk_sp<SkPathEffect>(new SkLine2DPathEffect(width, matrix));
     }
 
@@ -67,7 +70,9 @@
 
 protected:
     SkLine2DPathEffect(SkScalar width, const SkMatrix& matrix)
-        : Sk2DPathEffect(matrix), fWidth(width) {}
+        : Sk2DPathEffect(matrix), fWidth(width) {
+            SkASSERT(width >= 0);
+        }
     void flatten(SkWriteBuffer&) const override;
 
     void nextSpan(int u, int v, int ucount, SkPath*) const override;