GEOHASH_clone

Author: MaartenZonneveld

Sources/FlitsGeohashC/flitsgeohash.c

@@ -170,6 +170,7 @@ void add_hash(GeohashArray* array, char* hash) {
         if (!new_hashes) {
             // Allocation failed
             GEOHASH_free_array(array);
+            free(hash);
             exit(EXIT_FAILURE);
         }
         array->hashes = new_hashes;
@@ -182,6 +183,20 @@ int geohash_equals(const char* a, const char* b) {
     return strcmp(a, b) == 0;
 }
 
+char* GEOHASH_clone(const char* hash) {
+    if (!hash) {
+        exit(EXIT_FAILURE);
+        return NULL;
+    }
+    
+    char* clone = strdup(hash);
+    if (!clone) {
+        exit(EXIT_FAILURE);
+        return NULL;
+    }
+    return clone;
+}
+
 GeohashArray
 GEOHASH_hashes_for_region(double centerLat, double centerLon, double latDelta, double lonDelta, unsigned int len) {
 
@@ -194,9 +209,9 @@ GEOHASH_hashes_for_region(double centerLat, double centerLon, double latDelta, d
     char* ne = GEOHASH_encode(north, east, len);
     char* se = GEOHASH_encode(south, east, len);
 
-    char* current = strdup(nw);
-    char* eastLimit = strdup(ne);
-    char* westStart = strdup(nw);
+    char* current = GEOHASH_clone(nw);
+    char* eastLimit = GEOHASH_clone(ne);
+    char* westStart = GEOHASH_clone(nw);
 
     GeohashArray result = {
         .hashes = malloc(128 * sizeof(char*)),
@@ -208,26 +223,26 @@ GEOHASH_hashes_for_region(double centerLat, double centerLon, double latDelta, d
         exit(EXIT_FAILURE);
     }
 
-    add_hash(&result, strdup(current));
+    add_hash(&result, GEOHASH_clone(current));
+    
     int maxIterations = MAX_ITERATIONS; // Prevent infinite loops
-
     while (!geohash_equals(current, se) && maxIterations-- > 0) {
         if (geohash_equals(nw, ne)) {
             // Single column case
             char* nextSouth = GEOHASH_get_adjacent(westStart, GEOHASH_SOUTH);
             free(westStart);
             westStart = nextSouth;
             free(current);
-            current = strdup(westStart);
-            add_hash(&result, strdup(current));
+            current = GEOHASH_clone(westStart);
+            add_hash(&result, GEOHASH_clone(current));
             continue;
         }
 
         // Move east
         char* next = GEOHASH_get_adjacent(current, GEOHASH_EAST);
         free(current);
         current = next;
-        add_hash(&result, strdup(current));
+        add_hash(&result, GEOHASH_clone(current));
 
         if (geohash_equals(current, eastLimit) && !geohash_equals(current, se)) {
             char* tmp;
@@ -241,8 +256,8 @@ GEOHASH_hashes_for_region(double centerLat, double centerLon, double latDelta, d
             westStart = tmp;
 
             free(current);
-            current = strdup(westStart);
-            add_hash(&result, strdup(current));
+            current = GEOHASH_clone(westStart);
+            add_hash(&result, GEOHASH_clone(current));
         }
     }