4 files changed, 17 insertions, 7 deletions
diff --git a/src/pathops/SkOpContour.h b/src/pathops/SkOpContour.h
index d0e09a3a70..b9f0b85af5 100644
--- a/src/pathops/SkOpContour.h
+++ b/src/pathops/SkOpContour.h
@@ -269,7 +269,9 @@ public:
         SkASSERT(fCount > 0);
         SkOpSegment* segment = &fHead;
         do {
-            segment->moveMultiples();
+            if (!segment->moveMultiples()) {
+                return false;
+            }
         } while ((segment = segment->next()));
         return true;
     }
diff --git a/src/pathops/SkOpSegment.cpp b/src/pathops/SkOpSegment.cpp
index 67f172e58a..2ba7d79b30 100644
--- a/src/pathops/SkOpSegment.cpp
+++ b/src/pathops/SkOpSegment.cpp
@@ -1297,12 +1297,14 @@ bool SkOpSegment::missingCoincidence(SkOpCoincidence* coincidences, SkChunkAlloc
 }
 
 // if a span has more than one intersection, merge the other segments' span as needed
-void SkOpSegment::moveMultiples() {
+bool SkOpSegment::moveMultiples() {
     debugValidate();
     SkOpSpanBase* test = &fHead;
     do {
         int addCount = test->spanAddsCount();
-        SkASSERT(addCount >= 1);
+        if (addCount < 1) {
+            return false;
+        }
         if (addCount == 1) {
             continue;
         }
@@ -1393,6 +1395,7 @@ checkNextSpan:
         ;
     } while ((test = test->final() ? nullptr : test->upCast()->next()));
     debugValidate();
+    return true;
 }
 
 // Move nearby t values and pts so they all hang off the same span. Alignment happens later.
diff --git a/src/pathops/SkOpSegment.h b/src/pathops/SkOpSegment.h
index 06649aa2be..40a50c5fe0 100644
--- a/src/pathops/SkOpSegment.h
+++ b/src/pathops/SkOpSegment.h
@@ -271,7 +271,7 @@ public:
     bool markWinding(SkOpSpan* , int winding, int oppWinding);
     bool match(const SkOpPtT* span, const SkOpSegment* parent, double t, const SkPoint& pt) const;
     bool missingCoincidence(SkOpCoincidence* coincidences, SkChunkAlloc* allocator);
-    void moveMultiples();
+    bool moveMultiples();
     void moveNearby();
 
     SkOpSegment* next() const {
diff --git a/src/pathops/SkPathOpsCommon.cpp b/src/pathops/SkPathOpsCommon.cpp
index 0060db2f30..829f8a50d5 100644
--- a/src/pathops/SkPathOpsCommon.cpp
+++ b/src/pathops/SkPathOpsCommon.cpp
@@ -425,11 +425,14 @@ static bool missingCoincidence(SkOpContourHead* contourList,
     return result;
 }
 
-static void moveMultiples(SkOpContourHead* contourList) {
+static bool moveMultiples(SkOpContourHead* contourList) {
     SkOpContour* contour = contourList;
     do {
-        contour->moveMultiples();
+        if (!contour->moveMultiples()) {
+            return false;
+        }
     } while ((contour = contour->next()));
+    return true;
 }
 
 static void moveNearby(SkOpContourHead* contourList) {
@@ -451,7 +454,9 @@ bool HandleCoincidence(SkOpContourHead* contourList, SkOpCoincidence* coincidenc
     SkOpGlobalState* globalState = contourList->globalState();
     // combine t values when multiple intersections occur on some segments but not others
     DEBUG_COINCIDENCE_HEALTH(contourList, "start");
-    moveMultiples(contourList);
+    if (!moveMultiples(contourList)) {
+        return false;
+    }
     DEBUG_COINCIDENCE_HEALTH(contourList, "moveMultiples");
     findCollapsed(contourList);
     DEBUG_COINCIDENCE_HEALTH(contourList, "findCollapsed");