Skip to content

Commit 07351b3

Browse files
committed
Fix some problems reported by Coverity
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.
1 parent f74bf2a commit 07351b3

6 files changed

Lines changed: 23 additions & 17 deletions

File tree

src/FilterLineEdit.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
#include <QMenu>
77
#include <QWhatsThis>
88

9-
FilterLineEdit::FilterLineEdit(QWidget* parent, std::vector<FilterLineEdit*>* filters, size_t columnnum) : QLineEdit(parent), filterList(filters), columnNumber(columnnum)
9+
FilterLineEdit::FilterLineEdit(QWidget* parent, std::vector<FilterLineEdit*>* filters, size_t columnnum) :
10+
QLineEdit(parent),
11+
filterList(filters),
12+
columnNumber(columnnum),
13+
no_conditional_format(true)
1014
{
1115
setPlaceholderText(tr("Filter"));
1216
setClearButtonEnabled(true);

src/FindReplaceDialog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
FindReplaceDialog::FindReplaceDialog(QWidget* parent)
88
: QDialog(parent),
99
ui(new Ui::FindReplaceDialog),
10+
m_scintilla(nullptr),
1011
foundIndicatorNumber(0),
1112
findInProgress(false)
1213
{

src/TableBrowser.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,7 @@ void TableBrowser::init(DBBrowserDB* _db)
328328
void TableBrowser::reset()
329329
{
330330
// Reset the model
331-
if(m_model)
332-
m_model->reset();
331+
m_model->reset();
333332

334333
// Remove all stored table information browse data tab
335334
m_settings.clear();

src/sql/sqlitetypes.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,10 @@ class Table : public Object
437437
class IndexedColumn
438438
{
439439
public:
440-
IndexedColumn() {}
440+
IndexedColumn()
441+
: m_isExpression(false)
442+
{
443+
}
441444

442445
IndexedColumn(const std::string& name, bool expr, const std::string& order = std::string())
443446
: m_name(name),

src/sqlitedb.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,12 +1050,11 @@ bool DBBrowserDB::executeMultiSQL(QByteArray query, bool dirty, bool log)
10501050
const char * const tail_start = tail;
10511051
const char * const tail_end = tail + query.size() + 1;
10521052
size_t total_tail_length = static_cast<size_t>(tail_end - tail_start);
1053-
int res = SQLITE_OK;
10541053
unsigned int line = 0;
10551054
bool structure_updated = false;
10561055
int last_progress_value = -1;
10571056
std::string savepoint_name;
1058-
while(tail && *tail != 0 && (res == SQLITE_OK || res == SQLITE_DONE))
1057+
while(tail && *tail != 0)
10591058
{
10601059
line++;
10611060

@@ -1122,8 +1121,7 @@ bool DBBrowserDB::executeMultiSQL(QByteArray query, bool dirty, bool log)
11221121
}
11231122

11241123
// 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)
11271125
{
11281126
switch(sqlite3_step(vm))
11291127
{

src/sqlitetablemodel.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,8 @@ QVariant SqliteTableModel::data(const QModelIndex &index, int role) const
419419
if(m_imagePreviewEnabled && !isImageData(data).isNull())
420420
{
421421
QImage img;
422-
img.loadFromData(data);
423-
return QPixmap::fromImage(img);
422+
if(img.loadFromData(data))
423+
return QPixmap::fromImage(img);
424424
}
425425
}
426426

@@ -796,16 +796,17 @@ std::vector<std::string> SqliteTableModel::getColumns(std::shared_ptr<sqlite3> p
796796
pDb = m_db.get(tr("retrieving list of columns"));
797797

798798
sqlite3_stmt* stmt;
799-
int status = sqlite3_prepare_v2(pDb.get(), sQuery.c_str(), static_cast<int>(sQuery.size()), &stmt, nullptr);
800799
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)
802801
{
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)
806803
{
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+
}
809810
}
810811
}
811812
sqlite3_finalize(stmt);

0 commit comments

Comments
 (0)