diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-03-09 07:38:47 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-09 14:54:30 +0000 |
| commit | 74b429086122e19e82fe090fc999120ed48d3532 (patch) | |
| tree | 0e9ee4be41ba35dafbd82c42ac7d40213de81250 /src/pathops/SkOpCoincidence.cpp | |
| parent | b537879c7214efd87840c9a7267ab3b3facda873 (diff) | |
some fuzzer fixes
should fix three or four of the PathOp asserts
triggered by the fuzzer tool.
R=kjlubick@google.com
Bug: skia:
Change-Id: I470895addf1e922da6a7c41d44d54eca92e68fb6
Reviewed-on: https://skia-review.googlesource.com/113163
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'src/pathops/SkOpCoincidence.cpp')
| -rw-r--r-- | src/pathops/SkOpCoincidence.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pathops/SkOpCoincidence.cpp b/src/pathops/SkOpCoincidence.cpp index 2f9d28f9ee..8e5c6c1d4d 100644 --- a/src/pathops/SkOpCoincidence.cpp +++ b/src/pathops/SkOpCoincidence.cpp @@ -694,7 +694,7 @@ bool SkOpCoincidence::addOrOverlap(SkOpSegment* coinSeg, SkOpSegment* oppSeg, SkASSERT(!cs || !cs->deleted()); SkASSERT(!os || !os->deleted()); SkASSERT(!ce || !ce->deleted()); - SkASSERT(!oe || !oe->deleted()); + FAIL_IF(oe && oe->deleted()); const SkOpPtT* csExisting = !cs ? coinSeg->existing(coinTs, nullptr) : nullptr; const SkOpPtT* ceExisting = !ce ? coinSeg->existing(coinTe, nullptr) : nullptr; FAIL_IF(csExisting && csExisting == ceExisting); @@ -723,6 +723,7 @@ bool SkOpCoincidence::addOrOverlap(SkOpSegment* coinSeg, SkOpSegment* oppSeg, csWritable->span()->addOpp(osWritable->span()); cs = csWritable; os = osWritable->active(); + FAIL_IF(!os); FAIL_IF((ce && ce->deleted()) || (oe && oe->deleted())); } if (!ce || !oe) { |