From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 7 May 2009 18:53:14 +0000 (+0200)
Subject: Properly handle multiple spaces in a row in msgs sent by (faulty?) ircds
X-Git-Tag: 0.5-rc1~202
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=477eadcad3381620af859e3f4f91daaa67a17cbe

Properly handle multiple spaces in a row in msgs sent by (faulty?) ircds

Fixes #681.
---

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 19466cb0..4355b30a 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -57,11 +57,23 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) {
   // NOTE: This assumes that this is true in raw encoding, but well, hopefully there are no servers running in japanese on protocol level...
   int idx = msg.indexOf(" :");
   if(idx >= 0) {
-    if(msg.length() > idx + 2) trailing = msg.mid(idx + 2);
+    if(msg.length() > idx + 2)
+      trailing = msg.mid(idx + 2);
     msg = msg.left(idx);
   }
   // OK, now it is safe to split...
   QList<QByteArray> params = msg.split(' ');
+
+  // This could still contain empty elements due to (faulty?) ircds sending multiple spaces in a row
+  // Also, QByteArray is not nearly as convenient to work with as QString for such things :)
+  QList<QByteArray>::iterator iter = params.begin();
+  while(iter != params.end()) {
+    if(iter->isEmpty())
+      iter = params.erase(iter);
+    else
+      ++iter;
+  }
+
   if(!trailing.isEmpty()) params << trailing;
   if(params.count() < 1) {
     qWarning() << "Received invalid string from server!";