mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-05-14 15:59:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix uninitialized value memory error (#793)

Browse Source 
While profiling using Valgrind, two uninitialized value errors popped up,
because the dataSource iVar was used in the if check from the editTextChanged
function before initializing it. This commit moves the dataSource
initializations before any other calls.
This commit is contained in:
Iulian Onofrei
2016-10-04 18:04:17 +03:00
committed by Justin Clift
parent 9d6713c5ad
commit 2bdd71a78b
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EditDialog.cpp
+21 -17
View File
@@ -94,31 +94,34 @@ void EditDialog::loadData(const QByteArray& data)
case Null:
switch (editMode) {
case TextEditor:
// The text widget buffer is now the main data source
dataSource = TextBuffer;
// Empty the text editor contents, then enable text editing
ui->editorText->clear();
ui->editorText->setEnabled(true);
// The text widget buffer is now the main data source
dataSource = TextBuffer;
break;
case HexEditor:
// The hex widget buffer is now the main data source
dataSource = HexBuffer;
// Load the Null into the hex editor
hexEdit->setData(data);
// The hex widget buffer is now the main data source
dataSource = HexBuffer;
break;
case ImageViewer:
// The hex widget buffer is now the main data source
dataSource = HexBuffer;
// Clear any image from the image viewing widget
ui->editorImage->setPixmap(QPixmap(0,0));
// Load the Null into the hex editor
hexEdit->setData(data);
// The hex widget buffer is now the main data source
dataSource = HexBuffer;
break;
}
break;
@@ -126,6 +129,9 @@ void EditDialog::loadData(const QByteArray& data)
case Text:
switch (editMode) {
case TextEditor:
// The text widget buffer is now the main data source
dataSource = TextBuffer;
// Load the text into the text editor
textData = QString::fromUtf8(data.constData(), data.size());
ui->editorText->setPlainText(textData);
@@ -136,20 +142,21 @@ void EditDialog::loadData(const QByteArray& data)
// Select all of the text by default
ui->editorText->selectAll();
// The text widget buffer is now the main data source
dataSource = TextBuffer;
break;
case HexEditor:
// The hex widget buffer is now the main data source
dataSource = HexBuffer;
// Load the text into the hex editor
hexEdit->setData(data);
// The hex widget buffer is now the main data source
dataSource = HexBuffer;
break;
case ImageViewer:
// The text widget buffer is now the main data source
dataSource = TextBuffer;
// Clear any image from the image viewing widget
ui->editorImage->setPixmap(QPixmap(0,0));
@@ -163,9 +170,6 @@ void EditDialog::loadData(const QByteArray& data)
// Select all of the text by default
ui->editorText->selectAll();
// The text widget buffer is now the main data source
dataSource = TextBuffer;
break;
}
break;
@@ -200,15 +204,15 @@ void EditDialog::loadData(const QByteArray& data)
break;
default:
// The hex widget buffer is now the main data source
dataSource = HexBuffer;
// The data seems to be general binary data, which is always loaded
// into the hex widget (the only safe place for it)
// Load the data into the hex editor
hexEdit->setData(data);
// The hex widget buffer is now the main data source
dataSource = HexBuffer;
switch (editMode) {
case TextEditor:
// Disable text editing, and use a warning message as the contents