From: Florent Castelli <florent.castelli@gmail.com>
Date: Wed, 16 Oct 2013 21:15:23 +0000 (+0200)
Subject: Sanitize topic message
X-Git-Tag: 0.10-beta1~111
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f04db2cb802b1296ca739c823495930c71d3b4ab;hp=5b1428bf281a0142c9286380eec3d0655c39fc44

Sanitize topic message

The code handling the topic message isn't expecting any new lines
since it is usually not possible to have any from the IRC specs.
But we can have some Unicode new lines instead!
Qt is happily converting them to simple new lines which then crashes
the client with a stack overflow.
---

diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp
index 827452cc..13987e6c 100644
--- a/src/qtui/topicwidget.cpp
+++ b/src/qtui/topicwidget.cpp
@@ -156,12 +156,12 @@ void TopicWidget::setTopic(const QModelIndex &index)
         }
     }
 
-    _topic = newtopic;
+    _topic = sanitizeTopic(newtopic);
     _readonly = readonly;
 
     ui.topicEditButton->setVisible(!_readonly);
-    ui.topicLabel->setText(newtopic);
-    ui.topicLineEdit->setPlainText(newtopic);
+    ui.topicLabel->setText(_topic);
+    ui.topicLineEdit->setPlainText(_topic);
     switchPlain();
 }
 
@@ -264,3 +264,16 @@ bool TopicWidget::eventFilter(QObject *obj, QEvent *event)
 
     return false;
 }
+
+QString TopicWidget::sanitizeTopic(const QString& topic)
+{
+    // Normally, you don't have new lines in topic messages
+    // But the use of "plain text" functionnality from Qt replaces
+    // some unicode characters with a new line, which then triggers
+    // a stack overflow later
+    QString result(topic);
+    result.replace(QChar::ParagraphSeparator, " ");
+    result.replace(QChar::LineSeparator, " ");
+
+    return result;
+}
diff --git a/src/qtui/topicwidget.h b/src/qtui/topicwidget.h
index 2a6bc6ce..367867a0 100644
--- a/src/qtui/topicwidget.h
+++ b/src/qtui/topicwidget.h
@@ -57,6 +57,8 @@ private slots:
     void setUseCustomFont(const QVariant &);
 
 private:
+    QString sanitizeTopic(const QString& topic);
+
     Ui::TopicWidget ui;
 
     QString _topic;