diff options
| author |  Stephen White <senorblanco@chromium.org> | 2017-08-17 12:32:53 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-17 17:05:01 +0000 |
| commit | e0e20755f6c09b71038ced2bf4a00b4c4593f504 (patch) | |
| tree | f3c9cab4958a5d0e50ff4d6b8a222eb7aa766f1a /src/core | |
| parent | 559f534759f616f1d9a173e0045acead5ee4cae1 (diff) | |
If a conic contains any infinite points, abort chopping to quads.
Otherwise bad things (asserts, bogus data, dogs and cats living
together, mass hysteria).
Bug: 755043
Change-Id: I64cd1dacf553463f18babcb24deb2be08c762c67
Reviewed-on: https://skia-review.googlesource.com/35730
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkGeometry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp index a1e8419a41..4a2e9cc7f5 100644 --- a/src/core/SkGeometry.cpp +++ b/src/core/SkGeometry.cpp @@ -1156,7 +1156,7 @@ bool SkConic::asQuadTol(SkScalar tol) const { #define kMaxConicToQuadPOW2 5 int SkConic::computeQuadPOW2(SkScalar tol) const { - if (tol < 0 || !SkScalarIsFinite(tol)) { + if (tol < 0 || !SkScalarIsFinite(tol) || !SkPointsAreFinite(fPts, 3)) { return 0; } |