Merge pull request #2 from flitsmeister/feature/fix-memory-leak

Fix memory leak in encode

Author: MaartenZonneveld

Sources/FlitsGeohash/GeoHash.swift

@@ -46,7 +46,12 @@ public enum Geohash {
         if length < 1, length > 22 {
             assertionFailure("length must be greater than 0 and less than 23")
         }
-        return string(from: GEOHASH_encode(coordinate.latitude, coordinate.longitude, length))
+        guard let pointer = GEOHASH_encode(coordinate.latitude, coordinate.longitude, length) else {
+            fatalError()
+        }
+        let hash = string(from: pointer)
+        free(pointer)
+        return hash
     }
 
     public static func adjacent(hash: String, direction: Direction) -> String {
@@ -57,7 +62,7 @@ public enum Geohash {
             fatalError()
         }
         let adjacent = string(from: pointer)
-        GEOHASH_free_adjacent(pointer)
+        free(pointer)
         return adjacent
     }
 

Sources/FlitsGeohashC/cgeohash.h

@@ -23,10 +23,7 @@ typedef struct {
 } GEOHASH_neighbors;
 
 char* GEOHASH_encode(double latitude, double longitude, unsigned int hash_length);
-void GEOHASH_free_encode(char* hash);
-
 GEOHASH_neighbors* GEOHASH_get_neighbors(const char *hash);
 void GEOHASH_free_neighbors(GEOHASH_neighbors *neighbors);
 
 char* GEOHASH_get_adjacent(const char* hash, GEOHASH_direction dir);
-void GEOHASH_free_adjacent(char* hash);

Sources/FlitsGeohashC/cgeohash.m

@@ -83,11 +83,6 @@
     return hash;
 }
 
-void
-GEOHASH_free_encode(char* hash) {
-    free(hash);
-}
-
 GEOHASH_neighbors*
 GEOHASH_get_neighbors(const char* hash)
 {
@@ -166,8 +161,3 @@
     base[len] = BASE32_ENCODE_TABLE[idx];
     return base;
 }
-
-void
-GEOHASH_free_adjacent(char* hash) {
-    free(hash);
-}