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

Editors/Function hint: Guard against potential crashes

Browse Source 
Change-Id: I285fe66a2ef9fd9543150dbbec5da6a83657ae73
Task-number: QTCREATORBUG-14875
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-08-07 09:13:55 +02:00
parent 7a88612a8e
commit 07e1f78ca8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
View File

@@ -34,6 +34,7 @@
#include <utils/faketooltip.h> #include <utils/faketooltip.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <QDebug> #include <QDebug>
#include <QApplication> #include <QApplication>
@@ -201,7 +202,8 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e)
d->m_escapePressed = true; d->m_escapePressed = true;
e->accept(); e->accept();
} }
if (d->m_model->size() > 1) { QTC_CHECK(d->m_model);
if (d->m_model && d->m_model->size() > 1) {
QKeyEvent *ke = static_cast<QKeyEvent*>(e); QKeyEvent *ke = static_cast<QKeyEvent*>(e);
if (ke->key() == Qt::Key_Up) { if (ke->key() == Qt::Key_Up) {
previousPage(); previousPage();
@@ -220,10 +222,13 @@ bool FunctionHintProposalWidget::eventFilter(QObject *obj, QEvent *e)
emit explicitlyAborted(); emit explicitlyAborted();
return false; return false;
} else if (ke->key() == Qt::Key_Up || ke->key() == Qt::Key_Down) { } else if (ke->key() == Qt::Key_Up || ke->key() == Qt::Key_Down) {
if (d->m_model->size() > 1) QTC_CHECK(d->m_model);
if (d->m_model && d->m_model->size() > 1)
return false; return false;
} }
d->m_assistant->notifyChange(); QTC_CHECK(d->m_assistant);
if (d->m_assistant)
d->m_assistant->notifyChange();
} }
break; break;
case QEvent::WindowDeactivate: case QEvent::WindowDeactivate: