commit 4929a4accb9fba77ce8bb9e00eaab4f7930bc299
author Cary Clark <caryclark@skia.org> Wed Oct 17 14:12:41 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 17 19:12:07 2018 +0000
tree 8b86d4cac3ced2ec657c6dd57a875ccf20bce6aa
parent 89e2f3c873e4ee6689c90684f218d06ac6de0dde

fix pathops timeouts

R=kjlubick@google.com

Bug: skia:8475
Change-Id: I88a440d55872e8f655236b86e30a95bff1fef695
Reviewed-on: https://skia-review.googlesource.com/c/163128
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Cary Clark <caryclark@skia.org>

src/pathops/SkOpSegment.cpp

diff --git a/src/pathops/SkOpSegment.cpp b/src/pathops/SkOpSegment.cpp
index e35f6d0..89a39b4 100644
--- a/src/pathops/SkOpSegment.cpp
+++ b/src/pathops/SkOpSegment.cpp
@@ -921,7 +921,11 @@
     bool success = markWinding(spanStart, winding, oppWinding);
     SkOpSpanBase* last = nullptr;
     SkOpSegment* other = this;
+    int safetyNet = 100000;
     while ((other = other->nextChase(&start, &step, &spanStart, &last))) {
+        if (!--safetyNet) {
+            return false;
+        }
         if (spanStart->windSum() != SK_MinS32) {
             if (this->operand() == other->operand()) {
                 if (spanStart->windSum() != winding || spanStart->oppSum() != oppWinding) {