commit 2346aa0ee1b219299a0198f615e4213b048a33ed
author Chris Dalton <csmartdalton@google.com> Wed Jul 14 22:55:35 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jul 15 07:16:05 2021 +0000
tree e9ba757ad6ac29fa28142d514d0788cf7886bed5
parent 7d336c9557bd8537e922ee83b1138e4cd23fee6b

Stabilize the path bounds logic in tryAddPathToAtlas()

Accounts for empty, negative, NaN, and bounds that overflow an int
before attempting to add the path to an atlas.

Bug: chromium:1229463
Change-Id: I612b590e8102db359e06a7963c72e1958b82abc9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/428699
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Justin Novosad <junov@google.com>

src/gpu/tessellate/GrTessellationPathRenderer.cpp

diff --git a/src/gpu/tessellate/GrTessellationPathRenderer.cpp b/src/gpu/tessellate/GrTessellationPathRenderer.cpp
index b5ff634..b80071f 100644
--- a/src/gpu/tessellate/GrTessellationPathRenderer.cpp
+++ b/src/gpu/tessellate/GrTessellationPathRenderer.cpp
@@ -137,9 +137,8 @@
         return true;
     }
 
-    SkRect pathDevBounds = args.fViewMatrix->mapRect(args.fShape->bounds());
+    const SkRect pathDevBounds = args.fViewMatrix->mapRect(args.fShape->bounds());
     if (pathDevBounds.isEmpty()) {
-        // tryAddPathToAtlas() doesn't accept empty bounds.
         if (path.isInverseFillType()) {
             args.fSurfaceDrawContext->drawPaint(args.fClip, std::move(args.fPaint),
                                                 *args.fViewMatrix);
@@ -251,9 +250,8 @@
     if (viewMatrix.hasPerspective()) {
         return GrFPFailure(std::move(inputFP));
     }
-    SkRect pathDevBounds = viewMatrix.mapRect(path.getBounds());
+    const SkRect pathDevBounds = viewMatrix.mapRect(path.getBounds());
     if (pathDevBounds.isEmpty()) {
-        // tryAddPathToAtlas() doesn't accept empty bounds.
         return path.isInverseFillType() ? GrFPSuccess(std::move(inputFP))
                                         : GrFPFailure(std::move(inputFP));
     }
@@ -324,7 +322,9 @@
                                                    const VisitProxiesFn& visitProxiesUsedByDraw) {
     SkASSERT(!viewMatrix.hasPerspective());  // See onCanDrawPath().
 
-    if (!fAtlasMaxSize) {
+    // Write as the NOT of positive logic, so we will return false if any values are NaN.
+    if (!(pathDevBounds.width() > 0 && pathDevBounds.width() <= fAtlasMaxSize) ||
+        !(pathDevBounds.height() > 0 && pathDevBounds.height() <= fAtlasMaxSize)) {
         return false;
     }
 
@@ -339,6 +339,10 @@
     pathDevBounds.roundOut(devIBounds);
     int widthInAtlas = devIBounds->width();
     int heightInAtlas = devIBounds->height();
+    if (widthInAtlas <= 0 || heightInAtlas <= 0) {
+        return false;
+    }
+
     if (SkNextPow2(widthInAtlas) == SkNextPow2(heightInAtlas)) {
         // Both dimensions go to the same pow2 band in the atlas. Use the larger dimension as height
         // for more efficient packing.