guard against numVerts = 0 for hole check

uber · Dec 15, 2023 · 4f0341c · 4f0341c
1 parent 7659732
commit 4f0341c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/h3lib/lib/polygon.c b/src/h3lib/lib/polygon.c
@@ -130,11 +130,12 @@ bool cellBoundaryInsidePolygon(const GeoPolygon *geoPolygon, const BBox *bboxes,
 
     // Check for line intersections with, or containment of, any hole
     for (int i = 0; i < geoPolygon->numHoles; i++) {
-        // TODO: There may be numVerts = 0 here, which would cause a crash
-        if (pointInsideGeoLoop(&boundaryLoop, boundaryBBox,
-                               &geoPolygon->holes[i].verts[0]) ||
-            cellBoundaryCrossesGeoLoop(&(geoPolygon->holes[i]), &bboxes[i + 1],
-                                       boundary, boundaryBBox)) {
+        // If the hole has no verts, it is not possible to intersect with it.
+        if (geoPolygon->holes[i].numVerts > 0 &&
+            (pointInsideGeoLoop(&boundaryLoop, boundaryBBox,
+                                &geoPolygon->holes[i].verts[0]) ||
+             cellBoundaryCrossesGeoLoop(&(geoPolygon->holes[i]), &bboxes[i + 1],
+                                        boundary, boundaryBBox))) {
             return false;
         }
     }