free the strings with the correct context handle

Author: nraynaud

gen/generator.jl

@@ -26,7 +26,11 @@ function rewrite(ex::Expr, cursor::Clang.CLFunctionDecl)
             if return_type_is_const_char(cursor)
                 :(unsafe_string($cc))
             else
-                :(string_copy_free($cc))
+                if endswith(string(cname), "_r")
+                    :(string_copy_free($cc, handle))
+                else
+                    :(string_copy_free($cc))
+                end
             end
         else
             cc

src/LibGEOS.jl

@@ -123,9 +123,9 @@ mutable struct GEOSContext
 end
 
 "Get a copy of a string from GEOS, freeing the GEOS managed memory."
-function string_copy_free(s::Cstring, context::GEOSContext = _context)::String
+function string_copy_free(s::Cstring, context::Ptr{Cvoid} = _context.ptr)::String
     copy = unsafe_string(s)
-    GEOSFree_r(context.ptr, pointer(s))
+    GEOSFree_r(context, pointer(s))
     return copy
 end
 

src/libgeos_api.jl

@@ -1296,7 +1296,8 @@ function GEOSRelate_r(handle, g1, g2)
                 g1::Ptr{GEOSGeometry},
                 g2::Ptr{GEOSGeometry},
             )::Cstring
-        )
+        ),
+        handle,
     )
 end
 
@@ -1317,7 +1318,8 @@ function GEOSRelateBoundaryNodeRule_r(handle, g1, g2, bnr)
                 g2::Ptr{GEOSGeometry},
                 bnr::Cint,
             )::Cstring
-        )
+        ),
+        handle,
     )
 end
 
@@ -1336,7 +1338,8 @@ function GEOSisValidReason_r(handle, g)
                 handle::GEOSContextHandle_t,
                 g::Ptr{GEOSGeometry},
             )::Cstring
-        )
+        ),
+        handle,
     )
 end
 
@@ -1414,7 +1417,8 @@ function GEOSGeomType_r(handle, g)
                 handle::GEOSContextHandle_t,
                 g::Ptr{GEOSGeometry},
             )::Cstring
-        )
+        ),
+        handle,
     )
 end
 
@@ -1834,7 +1838,8 @@ function GEOSWKTWriter_write_r(handle, writer, g)
                 writer::Ptr{GEOSWKTWriter},
                 g::Ptr{GEOSGeometry},
             )::Cstring
-        )
+        ),
+        handle,
     )
 end
 
@@ -2046,7 +2051,8 @@ function GEOSGeoJSONWriter_writeGeometry_r(handle, writer, g, indent)
                 g::Ptr{GEOSGeometry},
                 indent::Cint,
             )::Cstring
-        )
+        ),
+        handle,
     )
 end
 
@@ -3517,7 +3523,8 @@ function GEOSGeomToWKT_r(handle, g)
                 handle::GEOSContextHandle_t,
                 g::Ptr{GEOSGeometry},
             )::Cstring
-        )
+        ),
+        handle,
     )
 end