Fix memory leaks by using sqlite3_close_v2

m-kuhn · m-kuhn · commit 6d0f2afe4fab · 2017-11-20T19:57:27.000+01:00
diff --git a/src/core/qgsspatialiteutils.cpp b/src/core/qgsspatialiteutils.cpp
@@ -75,10 +75,10 @@ sqlite3_statement_unique_ptr spatialite_database_unique_ptr::prepare( const QStr
 
 void QgsSpatialiteCloser::operator()( sqlite3 *handle )
 {
-  int res = sqlite3_close( handle );
+  int res = sqlite3_close_v2( handle );
   if ( res != SQLITE_OK )
   {
-    QgsDebugMsg( QStringLiteral( "sqlite3_close() failed: %1" ).arg( res ) );
+    QgsDebugMsg( QStringLiteral( "sqlite3_close_v2() failed: %1" ).arg( res ) );
   }
 
   spatialite_cleanup_ex( mSpatialiteContext );
diff --git a/src/core/qgssqliteutils.cpp b/src/core/qgssqliteutils.cpp
@@ -21,7 +21,7 @@
 
 void QgsSqlite3Closer::operator()( sqlite3 *database )
 {
-  sqlite3_close( database );
+  sqlite3_close_v2( database );
 }
 
 void QgsSqlite3StatementFinalizer::operator()( sqlite3_stmt *statement )

Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,10 @@ sqlite3_statement_unique_ptr spatialite_database_unique_ptr::prepare( const QStr`
`75`	`75`
`76`	`76`	`void QgsSpatialiteCloser::operator()( sqlite3 *handle )`
`77`	`77`	`{`
`78`		`- int res = sqlite3_close( handle );`
	`78`	`+ int res = sqlite3_close_v2( handle );`
`79`	`79`	`if ( res != SQLITE_OK )`
`80`	`80`	`{`
`81`		`- QgsDebugMsg( QStringLiteral( "sqlite3_close() failed: %1" ).arg( res ) );`
	`81`	`+ QgsDebugMsg( QStringLiteral( "sqlite3_close_v2() failed: %1" ).arg( res ) );`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`spatialite_cleanup_ex( mSpatialiteContext );`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`void QgsSqlite3Closer::operator()( sqlite3 *database )`
`23`	`23`	`{`
`24`		`- sqlite3_close( database );`
	`24`	`+ sqlite3_close_v2( database );`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`void QgsSqlite3StatementFinalizer::operator()( sqlite3_stmt *statement )`