commit 595ac28c3990ea89ee40ec14117dc1667acfc126
author caryclark <caryclark@google.com> Mon Oct 24 08:41:45 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Oct 24 08:41:45 2016 -0700
tree 99bd0190a4108bbce5853ff020df8cc48df16bdf
parent b2cf266151a6698a6c667fb97f9c8d3cbdd8b4e6

fix a few more fuzzes

Minor changes to fix some fuzz conditions.
A couple of ignored asserts when the data
is fuzzy, and one fail condition when the
underlying data has already been deleted.

TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2443243002

Review-Url: https://codereview.chromium.org/2443243002

src/pathops/SkIntersections.cpp

diff --git a/src/pathops/SkIntersections.cpp b/src/pathops/SkIntersections.cpp
index 9683796..79206c3 100644
--- a/src/pathops/SkIntersections.cpp
+++ b/src/pathops/SkIntersections.cpp
@@ -67,7 +67,7 @@
         }
     }
     if (fUsed >= fMax) {
-        SkASSERT(0);  // FIXME : this error, if it is to be handled at runtime in release, must
+        SkOPASSERT(0);  // FIXME : this error, if it is to be handled at runtime in release, must
                       // be propagated all the way back down to the caller, and return failure.
         fUsed = 0;
         return 0;

src/pathops/SkOpCoincidence.cpp

diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp
index 1390533..dadcfa5 100755
--- a/src/pathops/SkOpCoincidence.cpp
+++ b/src/pathops/SkOpCoincidence.cpp
@@ -794,7 +794,7 @@
                     return true;
                 }
                 const SkOpPtT* ice = inner->coinPtTEnd();
-                SkASSERT(!ice->deleted());
+                FAIL_IF(ice->deleted());
                 if (outerOpp != innerOpp && this->overlap(ocs, oce, ics, ice, &overS, &overE)) {
                     (void) this->addIfMissing(ocs->starter(oce), ics->starter(ice),
                             overS, overE, outerOppWritable, innerOppWritable, added

src/pathops/SkOpSpan.h

diff --git a/src/pathops/SkOpSpan.h b/src/pathops/SkOpSpan.h
index 023e7ac..219020a 100644
--- a/src/pathops/SkOpSpan.h
+++ b/src/pathops/SkOpSpan.h
@@ -518,7 +518,7 @@
     void setOppValue(int oppValue) {
         SkASSERT(!final());
         SkASSERT(fOppSum == SK_MinS32);
-        SkASSERT(!oppValue || !fDone);
+        SkOPASSERT(!oppValue || !fDone);
         fOppValue = oppValue;
     }