uber · isaacbrodsky · Jan 19, 2022 · Dec 22, 2021 · Dec 22, 2021 · Dec 22, 2021
diff --git a/src/apps/fuzzers/fuzzerH3SetToLinkedGeo.c b/src/apps/fuzzers/fuzzerH3SetToLinkedGeo.c
@@ -21,26 +21,17 @@
 #include "h3api.h"
 #include "utility.h"
 
-typedef struct {
-    H3Index h3Set[1024];
-    int sz;
-} inputArgs;
-
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-    if (size < sizeof(inputArgs)) {
-        return 0;
-    }
-    const inputArgs *args = (const inputArgs *)data;
-    if (args->sz >= 1024) {
-        return 0;
-    }
+    const H3Index *h3Set = (const H3Index *)data;
+    int sz = size / sizeof(H3Index);
 
     LinkedGeoPolygon polygon;
-    H3Error err = H3_EXPORT(h3SetToLinkedGeo)(args->h3Set, args->sz, &polygon);
+    H3Error err = H3_EXPORT(h3SetToLinkedGeo)(h3Set, sz, &polygon);
+
     if (!err) {
         H3_EXPORT(destroyLinkedPolygon)(&polygon);
     }
     return 0;
 }
 
-AFL_HARNESS_MAIN(sizeof(inputArgs));
+AFL_HARNESS_MAIN(sizeof(H3Index) * 1024);
diff --git a/src/apps/testapps/testH3SetToLinkedGeo.c b/src/apps/testapps/testH3SetToLinkedGeo.c
@@ -45,6 +45,16 @@ SUITE(h3SetToLinkedGeo) {
         H3_EXPORT(destroyLinkedPolygon)(&polygon);
     }
 
+    TEST(invalid) {
+        LinkedGeoPolygon polygon;
+        H3Index set[] = {0xfffffffffffffff};
+        int numHexes = ARRAY_SIZE(set);
+
+        t_assert(H3_EXPORT(h3SetToLinkedGeo)(set, numHexes, &polygon) ==
+                     E_CELL_INVALID,
+                 "Invalid set fails");
+    }
+
     TEST(contiguous2) {
         LinkedGeoPolygon polygon;
         H3Index set[] = {0x8928308291bffff, 0x89283082957ffff};

diff --git a/src/apps/testapps/testH3SetToVertexGraph.c b/src/apps/testapps/testH3SetToVertexGraph.c
@@ -24,7 +24,7 @@ SUITE(h3SetToVertexGraph) {
     TEST(empty) {
         VertexGraph graph;
 
-        h3SetToVertexGraph(NULL, 0, &graph);
+        t_assertSuccess(h3SetToVertexGraph(NULL, 0, &graph));
 
         t_assert(graph.size == 0, "No edges added to graph");
 
@@ -36,7 +36,7 @@ SUITE(h3SetToVertexGraph) {
         H3Index set[] = {0x890dab6220bffff};
         int numHexes = ARRAY_SIZE(set);
 
-        h3SetToVertexGraph(set, numHexes, &graph);
+        t_assertSuccess(h3SetToVertexGraph(set, numHexes, &graph));
         t_assert(graph.size == 6, "All edges of one hex added to graph");
 
         destroyVertexGraph(&graph);
@@ -47,7 +47,7 @@ SUITE(h3SetToVertexGraph) {
         H3Index set[] = {0x8928308291bffff, 0x89283082943ffff};
         int numHexes = ARRAY_SIZE(set);
 
-        h3SetToVertexGraph(set, numHexes, &graph);
+        t_assertSuccess(h3SetToVertexGraph(set, numHexes, &graph));
         t_assert(graph.size == 12,
                  "All edges of two non-contiguous hexes added to graph");
 
@@ -59,7 +59,7 @@ SUITE(h3SetToVertexGraph) {
         H3Index set[] = {0x8928308291bffff, 0x89283082957ffff};
         int numHexes = ARRAY_SIZE(set);
 
-        h3SetToVertexGraph(set, numHexes, &graph);
+        t_assertSuccess(h3SetToVertexGraph(set, numHexes, &graph));
         t_assert(graph.size == 10, "All edges except 2 shared added to graph");
 
         destroyVertexGraph(&graph);
@@ -70,7 +70,7 @@ SUITE(h3SetToVertexGraph) {
         H3Index set[] = {0x894cc5365afffff, 0x894cc536537ffff};
         int numHexes = ARRAY_SIZE(set);
 
-        h3SetToVertexGraph(set, numHexes, &graph);
+        t_assertSuccess(h3SetToVertexGraph(set, numHexes, &graph));
         t_assert(graph.size == 12, "All edges except 2 shared added to graph");
 
         destroyVertexGraph(&graph);
@@ -82,7 +82,7 @@ SUITE(h3SetToVertexGraph) {
                          0x8928308289bffff};
         int numHexes = ARRAY_SIZE(set);
 
-        h3SetToVertexGraph(set, numHexes, &graph);
+        t_assertSuccess(h3SetToVertexGraph(set, numHexes, &graph));
         t_assert(graph.size == 3 * 4,
                  "All edges except 6 shared added to graph");
 
@@ -96,7 +96,7 @@ SUITE(h3SetToVertexGraph) {
                          0x8928308288fffff, 0x89283082883ffff};
         int numHexes = ARRAY_SIZE(set);
 
-        h3SetToVertexGraph(set, numHexes, &graph);
+        t_assertSuccess(h3SetToVertexGraph(set, numHexes, &graph));
         t_assert(graph.size == (6 * 3) + 6,
                  "All outer edges and inner hole edges added to graph");
 

diff --git a/src/h3lib/include/algos.h b/src/h3lib/include/algos.h
@@ -38,8 +38,8 @@ void _kRingInternal(H3Index origin, int k, H3Index *out, int *distances,
                     int maxIdx, int curK);
 
 // Create a vertex graph from a set of hexagons
-void h3SetToVertexGraph(const H3Index *h3Set, const int numHexes,
-                        VertexGraph *out);
+H3Error h3SetToVertexGraph(const H3Index *h3Set, const int numHexes,
+                           VertexGraph *out);
 
 // Create a LinkedGeoPolygon from a vertex graph
 void _vertexGraphToLinkedGeo(VertexGraph *graph, LinkedGeoPolygon *out);

diff --git a/src/h3lib/lib/algos.c b/src/h3lib/lib/algos.c
@@ -1034,8 +1034,8 @@ H3Error H3_EXPORT(polygonToCells)(const GeoPolygon *geoPolygon, int res,
  * @param numHexes Number of hexagons in the set
  * @param graph    Output graph
  */
-void h3SetToVertexGraph(const H3Index *h3Set, const int numHexes,
-                        VertexGraph *graph) {
+H3Error h3SetToVertexGraph(const H3Index *h3Set, const int numHexes,
+                           VertexGraph *graph) {
     CellBoundary vertices;
     LatLng *fromVtx;
     LatLng *toVtx;
@@ -1044,7 +1044,7 @@ void h3SetToVertexGraph(const H3Index *h3Set, const int numHexes,
         // We still need to init the graph, or calls to destroyVertexGraph will
         // fail
         initVertexGraph(graph, 0, 0);
-        return;
+        return E_SUCCESS;
     }
     int res = H3_GET_RESOLUTION(h3Set[0]);
     const int minBuckets = 6;
@@ -1053,7 +1053,12 @@ void h3SetToVertexGraph(const H3Index *h3Set, const int numHexes,
     initVertexGraph(graph, numBuckets, res);
     // Iterate through every hexagon
     for (int i = 0; i < numHexes; i++) {
-        H3_EXPORT(cellToBoundary)(h3Set[i], &vertices);
+        H3Error boundaryErr = H3_EXPORT(cellToBoundary)(h3Set[i], &vertices);
+        if (boundaryErr) {
+            // Destroy vertex graph as caller will not know to do so.
+            destroyVertexGraph(graph);
+            return boundaryErr;
+        }
         // iterate through every edge
         for (int j = 0; j < vertices.numVerts; j++) {
             fromVtx = &vertices.verts[j];
@@ -1070,6 +1075,7 @@ void h3SetToVertexGraph(const H3I
7C33
ndex *h3Set, const int numHexes,
             }
         }
     }
+    return E_SUCCESS;
 }
 
 /**
@@ -1120,7 +1126,10 @@ void _vertexGraphToLinkedGeo(VertexGraph *graph, LinkedGeoPolygon *out) {
 H3Error H3_EXPORT(h3SetToLinkedGeo)(const H3Index *h3Set, const int numHexes,
                                     LinkedGeoPolygon *out) {
     VertexGraph graph;
-    h3SetToVertexGraph(h3Set, numHexes, &graph);
+    H3Error err = h3SetToVertexGraph(h3Set, numHexes, &graph);
+    if (err) {
+        return err;
+    }
     _vertexGraphToLinkedGeo(&graph, out);
     if (normalizeMultiPolygon(out)) {
         return E_FAILED;