commit 0e912464cecf50cc152c3fb93c2aac31c8a99cac
author robertphillips <robertphillips@google.com> Fri Dec 12 12:47:59 2014 -0800
committer Commit bot <commit-bot@chromium.org> Fri Dec 12 12:47:59 2014 -0800
tree 90938e05196c66a9f5086209a76119b8ade683bb
parent 24da24dfad1883151ab1275c63963c9a31d17e3b

Harden validation for SkPathRef

Review URL: https://codereview.chromium.org/801003003

src/core/SkPathRef.cpp

diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp
index aed6cda..e7b70b9 100644
--- a/src/core/SkPathRef.cpp
+++ b/src/core/SkPathRef.cpp
@@ -452,11 +452,9 @@
     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;
             }