Java bindings: avoid double free when calling Dataset.Close()

Fixes #11566
OSGeo · Jan 2, 2025 · 64143e0 · 64143e0
1 parent 46372fe
commit 64143e0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/swig/include/Dataset.i b/swig/include/Dataset.i
@@ -272,6 +272,10 @@ public:
     }
   }
 
+#ifdef SWIGJAVA
+  %rename (CloseInternal) Close;
+  %javamethodmodifiers Close() "private";
+#endif
   CPLErr Close() {
      return GDALClose(self);
   }

diff --git a/swig/include/java/gdal_java.i b/swig/include/java/gdal_java.i
@@ -564,6 +564,17 @@ import org.gdal.gdalconst.gdalconstConstants;
   }
 %}
 
+%extend GDALDatasetShadow {
+%proxycode %{
+  public int Close() {
+    int ret = gdalJNI.Dataset_CloseInternal(swigCPtr, this);
+    swigCPtr = 0;
+    swigCMemOwn = false;
+    return ret;
+  }
+%}
+}
+
 %typemap(javacode) GDALDatasetShadow %{
 
   // Preferred name to match C++ API

diff --git a/swig/java/apps/GDALTestIO.java b/swig/java/apps/GDALTestIO.java
@@ -216,6 +216,9 @@ private static void testInt64() {
             if (data1[i] != data2[i])
                 throw new RuntimeException("int64 write and read values are not the same "+data1[i]+" "+data2[i]);
         }
+
+        dataset.Close();
+        dataset.Close();
     }
 
     private static void testGetMemFileBuffer()