Fix channel name validation. Thanks to hrw for reporting.

1 files changed, 3 insertions, 2 deletions

diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp
index d3c0448..5eb1758 100644
--- a/noncore/net/opieirc/ircservertab.cpp
+++ b/noncore/net/opieirc/ircservertab.cpp
@@ -114,15 +114,16 @@ void IRCServerTab::executeCommand(IRCTab *tab, QString line) {
    //JOIN
   if (command == "JOIN" || command == "J") {
         QString channel;
         stream >> channel;
         /* According to RFC 1459 */
         if (channel.length() > 0 && channel.length() < 200 &&
-            channel.find(",") == -1 && channel.find("") == -1) {
+            channel.find(",") == -1 && channel.find('\007') == -1) {
             
-            if (!channel.startsWith("#") && !channel.startsWith("&")) {
+            if (!channel.startsWith("#") && !channel.startsWith("&") 
+                && !channel.startsWith("+") && !channel.startsWith("!")) {
                 channel = channel.prepend("#");
             }
             m_session->join(channel);
         } else {
             tab->appendText("<font color=\"" + m_errorColor + "\">Unknown channel format!</font><br>");
         }