[Mono.Data.Sqlite] Fix a MonoTouch memory leak

Ensure SQLite3's GCHandle is freed when Close is called instead of Dispose.
Also make SQLiteConnection's Dispose call SQlite3's Dispose to ensure we free
the GCHandle in all cases.

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
index 00589e5605f5d80a65e6a2158bb2e0d61cd12e61..82a40ed6c8a1efc6c0a95ab55b5e7884ca7e9b94 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
@@ -49,10 +49,6 @@ namespace Mono.Data.Sqlite
     {\r
       if (bDisposing)\r
         Close();\r
-#if MONOTOUCH\r
-      if (gch.IsAllocated)\r
-        gch.Free ();\r
-#endif\r
     }\r
 \r
     // It isn't necessary to cleanup any functions we've registered.  If the connection\r
@@ -73,6 +69,10 @@ namespace Mono.Data.Sqlite
       }\r
 \r
       _sql = null;\r
+#if MONOTOUCH\r
+      if (gch.IsAllocated)\r
+        gch.Free ();\r
+#endif\r
     }\r
 \r
     internal override void Cancel()\r

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteConnection.cs b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteConnection.cs
index d1560c3103cfc9fb341389517bd8cf1155218b0b..961184bb0d7febfc94023cb7fd00418941927d9f 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteConnection.cs
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteConnection.cs
@@ -304,6 +304,9 @@ namespace Mono.Data.Sqlite
     {\r
       base.Dispose(disposing);\r
 \r
+      if (_sql != null)\r
+        _sql.Dispose ();\r
+\r
       if (disposing)\r
         Close();\r
     }\r