Fix some problems reported by Coverity

MKleusberg · MKleusberg · commit 07351b36b015 · 2020-02-25T22:10:25.000+01:00
This fixes some problems which were reported by Coverity. None of these
is critical and some are only theoretical issues which will never be
triggered. But better prepare the code for future changes and fix these
warnings properly instead of just silencing them.
diff --git a/src/FilterLineEdit.cpp b/src/FilterLineEdit.cpp
@@ -6,7 +6,11 @@
 #include <QMenu>
 #include <QWhatsThis>
 
-FilterLineEdit::FilterLineEdit(QWidget* parent, std::vector<FilterLineEdit*>* filters, size_t columnnum) : QLineEdit(parent), filterList(filters), columnNumber(columnnum)
+FilterLineEdit::FilterLineEdit(QWidget* parent, std::vector<FilterLineEdit*>* filters, size_t columnnum) :
+    QLineEdit(parent),
+    filterList(filters),
+    columnNumber(columnnum),
+    no_conditional_format(true)
 {
     setPlaceholderText(tr("Filter"));
     setClearButtonEnabled(true);
diff --git a/src/FindReplaceDialog.cpp b/src/FindReplaceDialog.cpp
@@ -7,6 +7,7 @@
 FindReplaceDialog::FindReplaceDialog(QWidget* parent)
     : QDialog(parent),
       ui(new Ui::FindReplaceDialog),
+      m_scintilla(nullptr),
       foundIndicatorNumber(0),
       findInProgress(false)
 {
diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
@@ -328,8 +328,7 @@ void TableBrowser::init(DBBrowserDB* _db)
 void TableBrowser::reset()
 {
     // Reset the model
-    if(m_model)
-        m_model->reset();
+    m_model->reset();
 
     // Remove all stored table information browse data tab
     m_settings.clear();
diff --git a/src/sql/sqlitetypes.h b/src/sql/sqlitetypes.h
@@ -437,7 +437,10 @@ class Table : public Object
 class IndexedColumn
 {
 public:
-    IndexedColumn() {}
+    IndexedColumn()
+        : m_isExpression(false)
+    {
+    }
 
     IndexedColumn(const std::string& name, bool expr, const std::string& order = std::string())
         : m_name(name),
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
@@ -1050,12 +1050,11 @@ bool DBBrowserDB::executeMultiSQL(QByteArray query, bool dirty, bool log)
     const char * const tail_start = tail;
     const char * const tail_end = tail + query.size() + 1;
     size_t total_tail_length = static_cast<size_t>(tail_end - tail_start);
-    int res = SQLITE_OK;
     unsigned int line = 0;
     bool structure_updated = false;
     int last_progress_value = -1;
     std::string savepoint_name;
-    while(tail && *tail != 0 && (res == SQLITE_OK || res == SQLITE_DONE))
+    while(tail && *tail != 0)
     {
         line++;
 
@@ -1122,8 +1121,7 @@ bool DBBrowserDB::executeMultiSQL(QByteArray query, bool dirty, bool log)
         }
 
         // Execute next statement
-        res = sqlite3_prepare_v2(_db, tail, static_cast<int>(tail_end - tail + 1), &vm, &tail);
-        if(res == SQLITE_OK)
+        if(sqlite3_prepare_v2(_db, tail, static_cast<int>(tail_end - tail + 1), &vm, &tail) == SQLITE_OK)
         {
             switch(sqlite3_step(vm))
             {
diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp
@@ -419,8 +419,8 @@ QVariant SqliteTableModel::data(const QModelIndex &index, int role) const
         if(m_imagePreviewEnabled && !isImageData(data).isNull())
         {
             QImage img;
-            img.loadFromData(data);
-            return QPixmap::fromImage(img);
+            if(img.loadFromData(data))
+                return QPixmap::fromImage(img);
         }
     }
 
@@ -796,16 +796,17 @@ std::vector<std::string> SqliteTableModel::getColumns(std::shared_ptr<sqlite3> p
         pDb = m_db.get(tr("retrieving list of columns"));
 
     sqlite3_stmt* stmt;
-    int status = sqlite3_prepare_v2(pDb.get(), sQuery.c_str(), static_cast<int>(sQuery.size()), &stmt, nullptr);
     std::vector<std::string> listColumns;
-    if(SQLITE_OK == status)
+    if(sqlite3_prepare_v2(pDb.get(), sQuery.c_str(), static_cast<int>(sQuery.size()), &stmt, nullptr) == SQLITE_OK)
     {
-        sqlite3_step(stmt);
-        int columns = sqlite3_data_count(stmt);
-        for(int i = 0; i < columns; ++i)
+        if(sqlite3_step(stmt) == SQLITE_ROW)
         {
-            listColumns.push_back(sqlite3_column_name(stmt, i));
-            fieldsTypes.push_back(sqlite3_column_type(stmt, i));
+            int columns = sqlite3_data_count(stmt);
+            for(int i = 0; i < columns; ++i)
+            {
+                listColumns.push_back(sqlite3_column_name(stmt, i));
+                fieldsTypes.push_back(sqlite3_column_type(stmt, i));
+            }
         }
     }
     sqlite3_finalize(stmt);

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`FindReplaceDialog::FindReplaceDialog(QWidget* parent)`
`8`	`8`	`: QDialog(parent),`
`9`	`9`	`ui(new Ui::FindReplaceDialog),`
	`10`	`+ m_scintilla(nullptr),`
`10`	`11`	`foundIndicatorNumber(0),`
`11`	`12`	`findInProgress(false)`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -328,8 +328,7 @@ void TableBrowser::init(DBBrowserDB* _db)`
`328`	`328`	`void TableBrowser::reset()`
`329`	`329`	`{`
`330`	`330`	`// Reset the model`
`331`		`- if(m_model)`
`332`		`- m_model->reset();`
	`331`	`+ m_model->reset();`
`333`	`332`
`334`	`333`	`// Remove all stored table information browse data tab`
`335`	`334`	`m_settings.clear();`
Original file line number	Diff line number	Diff line change
`@@ -1050,12 +1050,11 @@ bool DBBrowserDB::executeMultiSQL(QByteArray query, bool dirty, bool log)`
`1050`	`1050`	`const char * const tail_start = tail;`
`1051`	`1051`	`const char * const tail_end = tail + query.size() + 1;`
`1052`	`1052`	`size_t total_tail_length = static_cast<size_t>(tail_end - tail_start);`
`1053`		`- int res = SQLITE_OK;`
`1054`	`1053`	`unsigned int line = 0;`
`1055`	`1054`	`bool structure_updated = false;`
`1056`	`1055`	`int last_progress_value = -1;`
`1057`	`1056`	`std::string savepoint_name;`
`1058`		`- while(tail && *tail != 0 && (res == SQLITE_OK \|\| res == SQLITE_DONE))`
	`1057`	`+ while(tail && *tail != 0)`
`1059`	`1058`	`{`
`1060`	`1059`	`line++;`
`1061`	`1060`
`@@ -1122,8 +1121,7 @@ bool DBBrowserDB::executeMultiSQL(QByteArray query, bool dirty, bool log)`
`1122`	`1121`	`}`
`1123`	`1122`
`1124`	`1123`	`// Execute next statement`
`1125`		`- res = sqlite3_prepare_v2(_db, tail, static_cast<int>(tail_end - tail + 1), &vm, &tail);`
`1126`		`- if(res == SQLITE_OK)`
	`1124`	`+ if(sqlite3_prepare_v2(_db, tail, static_cast<int>(tail_end - tail + 1), &vm, &tail) == SQLITE_OK)`
`1127`	`1125`	`{`
`1128`	`1126`	`switch(sqlite3_step(vm))`
`1129`	`1127`	`{`
Original file line number	Diff line number	Diff line change
`@@ -419,8 +419,8 @@ QVariant SqliteTableModel::data(const QModelIndex &index, int role) const`
`419`	`419`	`if(m_imagePreviewEnabled && !isImageData(data).isNull())`
`420`	`420`	`{`
`421`	`421`	`QImage img;`
`422`		`- img.loadFromData(data);`
`423`		`- return QPixmap::fromImage(img);`
	`422`	`+ if(img.loadFromData(data))`
	`423`	`+ return QPixmap::fromImage(img);`
`424`	`424`	`}`
`425`	`425`	`}`
`426`	`426`
`@@ -796,16 +796,17 @@ std::vector<std::string> SqliteTableModel::getColumns(std::shared_ptr<sqlite3> p`
`796`	`796`	`pDb = m_db.get(tr("retrieving list of columns"));`
`797`	`797`
`798`	`798`	`sqlite3_stmt* stmt;`
`799`		`- int status = sqlite3_prepare_v2(pDb.get(), sQuery.c_str(), static_cast<int>(sQuery.size()), &stmt, nullptr);`
`800`	`799`	`std::vector<std::string> listColumns;`
`801`		`- if(SQLITE_OK == status)`
	`800`	`+ if(sqlite3_prepare_v2(pDb.get(), sQuery.c_str(), static_cast<int>(sQuery.size()), &stmt, nullptr) == SQLITE_OK)`
`802`	`801`	`{`
`803`		`- sqlite3_step(stmt);`
`804`		`- int columns = sqlite3_data_count(stmt);`
`805`		`- for(int i = 0; i < columns; ++i)`
	`802`	`+ if(sqlite3_step(stmt) == SQLITE_ROW)`
`806`	`803`	`{`
`807`		`- listColumns.push_back(sqlite3_column_name(stmt, i));`
`808`		`- fieldsTypes.push_back(sqlite3_column_type(stmt, i));`
	`804`	`+ int columns = sqlite3_data_count(stmt);`
	`805`	`+ for(int i = 0; i < columns; ++i)`
	`806`	`+ {`
	`807`	`+ listColumns.push_back(sqlite3_column_name(stmt, i));`
	`808`	`+ fieldsTypes.push_back(sqlite3_column_type(stmt, i));`
	`809`	`+ }`
`809`	`810`	`}`
`810`	`811`	`}`
`811`	`812`	`sqlite3_finalize(stmt);`