diff options
| author |  robertphillips <robertphillips@google.com> | 2014-12-12 12:47:59 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-12 12:47:59 -0800 |
| commit | 0e912464cecf50cc152c3fb93c2aac31c8a99cac (patch) | |
| tree | 90938e05196c66a9f5086209a76119b8ade683bb | |
| parent | 24da24dfad1883151ab1275c63963c9a31d17e3b (diff) | |
Harden validation for SkPathRef
Review URL: https://codereview.chromium.org/801003003
| -rw-r--r-- | src/core/SkPathRef.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp index aed6cdaee7..e7b70b9285 100644 --- a/src/core/SkPathRef.cpp +++ b/src/core/SkPathRef.cpp @@ -452,11 +452,9 @@ void SkPathRef::validate() const { if (!fBoundsIsDirty && !fBounds.isEmpty()) { bool isFinite = true; for (int i = 0; i < fPointCnt; ++i) { - SkASSERT(!fPoints[i].isFinite() || ( - fBounds.fLeft - fPoints[i].fX < SK_ScalarNearlyZero && - fPoints[i].fX - fBounds.fRight < SK_ScalarNearlyZero && - fBounds.fTop - fPoints[i].fY < SK_ScalarNearlyZero && - fPoints[i].fY - fBounds.fBottom < SK_ScalarNearlyZero)); + SkASSERT(!fPoints[i].isFinite() || + (fPoints[i].fX >= fBounds.fLeft && fPoints[i].fX <= fBounds.fRight && + fPoints[i].fY >= fBounds.fTop && fPoints[i].fY <= fBounds.fBottom)); if (!fPoints[i].isFinite()) { isFinite = false; } |