From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Wed, 20 Feb 2013 19:31:54 +0000 (+0100)
Subject: Trim the last parameter except for PRIVMSG and NOTICE
X-Git-Tag: 0.9-beta1~11
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=9e637b2c82e4c6222e33f07ce9944794a95b9b1a

Trim the last parameter except for PRIVMSG and NOTICE

Just to be sure that we won't encounter any more side-effects with
ircds sending random trailing whitespace, let's trim the last parameter
except for PRIVMSG and NOTICE.
---

diff --git a/src/core/ircparser.cpp b/src/core/ircparser.cpp
index f3db4fce..0d473981 100644
--- a/src/core/ircparser.cpp
+++ b/src/core/ircparser.cpp
@@ -308,6 +308,11 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e)
         for (int i = decParams.count(); i < params.count(); i++)
             decParams << net->serverDecode(params.at(i));
 
+        // We want to trim the last param just in case, except for PRIVMSG and NOTICE
+        // ... but those happen to be the only ones not using defaultHandling anyway
+        if (!decParams.isEmpty() && decParams.last().endsWith(' '))
+            decParams.append(decParams.takeLast().trimmed());
+
         IrcEvent *event;
         if (type == EventManager::IrcEventNumeric)
             event = new IrcEventNumeric(num, net, prefix, target);