summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-06-06 15:25:55 +0200
committerEike Ziller <eike.ziller@digia.com>2014-06-06 16:00:39 +0200
commitcc64529fc4af97028a7fb195fc95a33fc9671f54 (patch)
tree15ee7287e196bac07af022da55c888b1de332f27
parentb90452e309dfeb308fd9b82b4fce8f32588caeb4 (diff)
downloadqt-creator-cc64529fc4af97028a7fb195fc95a33fc9671f54.tar.gz
CodePaster: Do not crash in case of invalid default protocol
Task-number: QTCREATORBUG-12364 Change-Id: I6e9bf75dd6b8df187a6802e9d90c3d986cc86a5c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--src/plugins/cpaster/pasteview.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp
index 47a656984f..d196f66040 100644
--- a/src/plugins/cpaster/pasteview.cpp
+++ b/src/plugins/cpaster/pasteview.cpp
@@ -31,6 +31,7 @@
#include "protocol.h"
#include <coreplugin/icore.h>
+#include <utils/qtcassert.h>
#include <QPushButton>
#include <QSettings>
@@ -112,6 +113,7 @@ void PasteView::contentChanged()
void PasteView::protocolChanged(int p)
{
+ QTC_ASSERT(p >= 0 && p < m_protocols.size(), return);
const unsigned caps = m_protocols.at(p)->capabilities();
m_ui.uiDescription->setEnabled(caps & Protocol::PostDescriptionCapability);
m_ui.uiUsername->setEnabled(caps & Protocol::PostUserNameCapability);
@@ -215,6 +217,8 @@ void PasteView::accept()
void PasteView::setProtocol(const QString &protocol)
{
const int index = m_ui.protocolBox->findText(protocol);
+ if (index < 0)
+ return;
m_ui.protocolBox->setCurrentIndex(index);
if (index == m_ui.protocolBox->currentIndex())
protocolChanged(index); // Force enabling