X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fctcphandler.cpp;h=23753ccb746bf53a692f7f5878a16cd75e3f7b79;hb=2ef12747a748a78311ee51b4bf833e1664347d47;hp=e6b534433733ae5509f2151bd923ed6ea10b3c6e;hpb=f62cdd391a5e30ef2d2ffbcaa0718904b1652d4e;p=quassel.git

diff --git a/src/core/ctcphandler.cpp b/src/core/ctcphandler.cpp
index e6b53443..23753ccb 100644
--- a/src/core/ctcphandler.cpp
+++ b/src/core/ctcphandler.cpp
@@ -107,15 +107,28 @@ void CtcpHandler::parse(Message::Type messageType, const QString &prefix, const
       displayMsg(messageType, target, userDecode(target, dequotedMessage.left(xdelimPos)), prefix, flags);
 
     xdelimEndPos = dequotedMessage.indexOf(XDELIM, xdelimPos + 1);
-    
-    ctcp = xdelimDequote(dequotedMessage.mid(xdelimPos + 1, xdelimEndPos - xdelimPos - 1));
-    dequotedMessage = dequotedMessage.mid(xdelimEndPos + 1);
-    
+    if(xdelimEndPos == -1) {
+      // no matching end delimiter found...
+      dequotedMessage = dequotedMessage.mid(xdelimPos + 1);
+      break;
+    } else {
+      ctcp = xdelimDequote(dequotedMessage.mid(xdelimPos + 1, xdelimEndPos - xdelimPos - 1));
+      dequotedMessage = dequotedMessage.mid(xdelimEndPos + 1);
+    }
+
     //dispatch the ctcp command
-    spacePos = ctcp.indexOf(' ');
     QString ctcpcmd = userDecode(target, ctcp.left(spacePos));
     QString ctcpparam = userDecode(target, ctcp.mid(spacePos + 1));
 
+    spacePos = ctcp.indexOf(' ');
+    if(spacePos != -1) {
+      ctcpcmd = userDecode(target, ctcp.left(spacePos));
+      ctcpparam = userDecode(target, ctcp.mid(spacePos + 1));
+    } else {
+      ctcpcmd = userDecode(target, ctcp);
+      ctcpparam = QString();
+    }
+
     handle(ctcpcmd, Q_ARG(CtcpType, ctcptype), Q_ARG(QString, prefix), Q_ARG(QString, target), Q_ARG(QString, ctcpparam));
   }
   
@@ -164,7 +177,6 @@ void CtcpHandler::handlePing(CtcpType ctcptype, const QString &prefix, const QSt
 void CtcpHandler::handleVersion(CtcpType ctcptype, const QString &prefix, const QString &target, const QString &param) {
   Q_UNUSED(target)
   if(ctcptype == CtcpQuery) {
-    // FIXME use real Info about quassel :)
     reply(nickFromMask(prefix), "VERSION", QString("Quassel IRC (v%1 build >= %2) -- http://www.quassel-irc.org")
         .arg(Global::quasselVersion).arg(Global::quasselBuild));
     emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Received CTCP VERSION request by %1").arg(prefix));