feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix crash in VariableChooser

Browse Source 
fce83bd9f84883f93829e6ca9eacf098b018a02d in qtbase causes a crash:
setModel creates a new selection model, which calls currentChanged,
which accesses an uninitialized member. Hence, protect the access to it.

Change-Id: I144f40aa4286f1a9edba24519a30c08ff5091f57
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Giuseppe D'Angelo
2016-03-24 11:03:25 +01:00
parent 0fda5b6354
commit fb137ade7d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/variablechooser.cpp
View File

@@ -245,7 +245,10 @@ VariableChooserPrivate::VariableChooserPrivate(VariableChooser *parent)
: q(parent), : q(parent),
m_lineEdit(0), m_lineEdit(0),
m_textEdit(0), m_textEdit(0),
m_plainTextEdit(0) m_plainTextEdit(0),
m_iconButton(0),
m_variableTree(0),
m_variableDescription(0)
{ {
m_defaultDescription = VariableChooser::tr("Select a variable to insert."); m_defaultDescription = VariableChooser::tr("Select a variable to insert.");
@@ -408,6 +411,7 @@ void VariableChooser::addSupportForChildWidgets(QWidget *parent, MacroExpander *
*/ */
void VariableChooserPrivate::updateDescription(const QModelIndex &index) void VariableChooserPrivate::updateDescription(const QModelIndex &index)
{ {
if (m_variableDescription)
m_variableDescription->setText(m_model.data(index, Qt::ToolTipRole).toString()); m_variableDescription->setText(m_model.data(index, Qt::ToolTipRole).toString());
} }