Fix trampling on memory in Z/G/K/ELine.

[user/henk/code/inspircd.git] / src / commands / cmd_notice.cpp

diff --git a/src/commands/cmd_notice.cpp b/src/commands/cmd_notice.cpp
index 1f5b854e6e74902aeab01034928431404eaed85a..9a5248c0fa46d5c581726575d190ad74b52ab69f 100644 (file)
--- a/src/commands/cmd_notice.cpp
+++ b/src/commands/cmd_notice.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -91,7 +91,7 @@ CmdResult CommandNotice::Handle (const char** parameters, int pcnt, User *user)
                                return CMD_FAILURE;
                        }
 
-                       FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,parameters[1],status,except_list));
+                       FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,parameters[1],status,exempt_list));
 
                        if (status)
                        {
@@ -120,10 +120,29 @@ CmdResult CommandNotice::Handle (const char** parameters, int pcnt, User *user)
                return CMD_SUCCESS;
        }
        
+       const char* destnick = parameters[0];
+
        if (IS_LOCAL(user))
-               dest = ServerInstance->FindNickOnly(parameters[0]);
+       {
+               const char* targetserver = strchr(destnick, '@');
+
+               if (targetserver)
+               {
+                       char nickonly[NICKMAX+1];
+                       strlcpy(nickonly, destnick, targetserver - destnick + 1);
+                       dest = ServerInstance->FindNickOnly(nickonly);
+                       if (dest && strcasecmp(dest->server, targetserver + 1))
+                       {
+                               /* Incorrect server for user */
+                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                               return CMD_FAILURE;
+                       }
+               }
+               else
+                       dest = ServerInstance->FindNickOnly(destnick);
+       }
        else
-               dest = ServerInstance->FindNick(parameters[0]);
+               dest = ServerInstance->FindNick(destnick);
 
        if (dest)
        {