Fix possible resource leaks

MKleusberg · MKleusberg · commit 45a82252e1cf · 2018-12-27T11:55:21.000+01:00
See issue #1691.
diff --git a/src/RowLoader.cpp b/src/RowLoader.cpp
@@ -251,8 +251,9 @@ void RowLoader::process (Task & t)
             QMutexLocker lk(&cache_mutex);
             cache_data.set(row++, std::move(rowdata));
         }
+
+        sqlite3_finalize(stmt);
     }
-    sqlite3_finalize(stmt);
 
     if(row != t.row_begin)
         emit fetched(t.token, t.row_begin, row);
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
@@ -1064,12 +1064,12 @@ QByteArray DBBrowserDB::querySingleValueFromDb(const QString& sql, bool log, Cho
                 else
                     retval = "";
             }
-
-            sqlite3_finalize(stmt);
         } else {
             lastErrorMessage = tr("didn't receive any output from %1").arg(sql);
             qWarning() << lastErrorMessage;
         }
+
+        sqlite3_finalize(stmt);
     } else {
         lastErrorMessage = tr("could not execute command: %1").arg(sqlite3_errmsg(_db));
         qWarning() << lastErrorMessage;

Original file line number	Diff line number	Diff line change
`@@ -251,8 +251,9 @@ void RowLoader::process (Task & t)`
`251`	`251`	`QMutexLocker lk(&cache_mutex);`
`252`	`252`	`cache_data.set(row++, std::move(rowdata));`
`253`	`253`	`}`
	`254`	`+`
	`255`	`+ sqlite3_finalize(stmt);`
`254`	`256`	`}`
`255`		`- sqlite3_finalize(stmt);`
`256`	`257`
`257`	`258`	`if(row != t.row_begin)`
`258`	`259`	`emit fetched(t.token, t.row_begin, row);`