commit ca726abe1e4a2522b24e5143c5faf0e594a4802a
author reed <reed@google.com> Mon Feb 22 12:50:25 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 22 12:50:26 2016 -0800
tree 82aeae3da478bb96e94d8c152ec9646baa799ba9
parent d49a86ade0bab1fc3048d6ba5d8536abf25ed77c

fix misc asserts and checks found by fuzzer

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1719993002

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

samplecode/SampleFilterFuzz.cpp

diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp
index f8ceed4..687921a 100644
--- a/samplecode/SampleFilterFuzz.cpp
+++ b/samplecode/SampleFilterFuzz.cpp
@@ -204,7 +204,7 @@
 }
 
 static SkPath1DPathEffect::Style make_path_1d_path_effect_style() {
-    return static_cast<SkPath1DPathEffect::Style>(R(SkPath1DPathEffect::kStyleCount));
+    return static_cast<SkPath1DPathEffect::Style>(R((int)SkPath1DPathEffect::kLastEnum_Style + 1));
 }
 
 static SkColor make_color() {
@@ -527,9 +527,14 @@
     paint.setXfermodeMode(make_xfermode());
     paint.setPathEffect(make_path_effect());
     paint.setMaskFilter(make_mask_filter());
-    SkAutoTUnref<SkTypeface> typeface(
-        SkTypeface::CreateFromName(make_font_name().c_str(), make_typeface_style()));
-    paint.setTypeface(typeface);
+
+    if (false) {
+        // our validating buffer does not support typefaces yet, so skip this for now
+        SkAutoTUnref<SkTypeface> typeface(
+                      SkTypeface::CreateFromName(make_font_name().c_str(), make_typeface_style()));
+        paint.setTypeface(typeface);
+    }
+
     SkLayerRasterizer::Builder rasterizerBuilder;
     SkPaint paintForRasterizer;
     if (R(2) == 1) {