Fix finalize statement and close srs.db

mhugent · mhugent · commit 392be7846b29 · 2013-11-25T14:30:17.000+01:00
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -857,13 +857,15 @@ void QgsCoordinateTransform::searchDatumTransform( const QString& sql, QList< in
   int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );
   if ( openResult != SQLITE_OK )
   {
+    sqlite3_close( db );
     return;
   }
 
   sqlite3_stmt* stmt;
   int prepareRes = sqlite3_prepare( db, sql.toAscii(), sql.size(), &stmt, NULL );
   if ( prepareRes != SQLITE_OK )
   {
+    sqlite3_close( db );
     return;
   }
 
@@ -885,6 +887,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )
   int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );
   if ( openResult != SQLITE_OK )
   {
+    sqlite3_close( db );
     return transformString;
   }
 
@@ -893,6 +896,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )
   int prepareRes = sqlite3_prepare( db, sql.toAscii(), sql.size(), &stmt, NULL );
   if ( prepareRes != SQLITE_OK )
   {
+    sqlite3_close( db );
     return transformString;
   }
 
@@ -925,6 +929,8 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )
     }
   }
 
+  sqlite3_finalize( stmt );
+  sqlite3_close( db );
   return transformString;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -857,13 +857,15 @@ void QgsCoordinateTransform::searchDatumTransform( const QString& sql, QList< in`
`857`	`857`	`int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );`
`858`	`858`	`if ( openResult != SQLITE_OK )`
`859`	`859`	`{`
	`860`	`+ sqlite3_close( db );`
`860`	`861`	`return;`
`861`	`862`	`}`
`862`	`863`
`863`	`864`	`sqlite3_stmt* stmt;`
`864`	`865`	`int prepareRes = sqlite3_prepare( db, sql.toAscii(), sql.size(), &stmt, NULL );`
`865`	`866`	`if ( prepareRes != SQLITE_OK )`
`866`	`867`	`{`
	`868`	`+ sqlite3_close( db );`
`867`	`869`	`return;`
`868`	`870`	`}`
`869`	`871`
`@@ -885,6 +887,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )`
`885`	`887`	`int openResult = sqlite3_open( QgsApplication::srsDbFilePath().toUtf8().constData(), &db );`
`886`	`888`	`if ( openResult != SQLITE_OK )`
`887`	`889`	`{`
	`890`	`+ sqlite3_close( db );`
`888`	`891`	`return transformString;`
`889`	`892`	`}`
`890`	`893`
`@@ -893,6 +896,7 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )`
`893`	`896`	`int prepareRes = sqlite3_prepare( db, sql.toAscii(), sql.size(), &stmt, NULL );`
`894`	`897`	`if ( prepareRes != SQLITE_OK )`
`895`	`898`	`{`
	`899`	`+ sqlite3_close( db );`
`896`	`900`	`return transformString;`
`897`	`901`	`}`
`898`	`902`
`@@ -925,6 +929,8 @@ QString QgsCoordinateTransform::datumTransformString( int datumTransform )`
`925`	`929`	`}`
`926`	`930`	`}`
`927`	`931`
	`932`	`+ sqlite3_finalize( stmt );`
	`933`	`+ sqlite3_close( db );`
`928`	`934`	`return transformString;`
`929`	`935`	`}`
`930`	`936`