Fixes for potential 4 byte memory leak, and crash

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index 75516542182d14ab1ed2274d33238811019021d6..acfd16da96bb185523100f92f03aec7d3b4a7feb 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -12,10 +12,7 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "modules.h"
 #include "inspstring.h"
-#include "mode.h"
 
 /* +s (secret) */
 #include "modes/cmode_s.h"
@@ -607,7 +604,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
                                        else
                                        {
                                                /* No mode handler? Unknown mode character then. */
-                                               user->WriteServ("472 %s %c :is unknown mode char to me",user->nick, modechar);
+                                               user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick, modechar);
                                        }
                                break;
                        }
@@ -1021,14 +1018,8 @@ void ModeHandler::RemoveMode(chanrec* channel)
 
        if (channel->IsModeSet(this->GetModeChar()))
        {
-               userrec* n = new userrec(ServerInstance);
-
                sprintf(moderemove,"-%c",this->GetModeChar());
-               n->SetFd(FD_MAGIC_NUMBER);
-
-               ServerInstance->SendMode(parameters, 2, n);
-
-               delete n;
+               ServerInstance->SendMode(parameters, 2, ServerInstance->FakeClient);
        }
 }