Make classbase and refcountbase uncopyable; expand comments on their indended uses

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

diff --git a/src/mode.cpp b/src/mode.cpp
index 1ac2b9e64902737e0a7d3589ca84beb923d4a2fb..47553f238294278fa8ebc4f166044943a9e87d7c 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "inspstring.h"
 
@@ -55,9 +53,16 @@ ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modelett
 {
 }
 
-ModeHandler::~ModeHandler()
+CullResult ModeHandler::cull()
 {
        ServerInstance->Modes->DelMode(this);
+       return classbase::cull();
+}
+
+ModeHandler::~ModeHandler()
+{
+       if (ServerInstance && ServerInstance->Modes->FindMode(mode, m_type) == this)
+               ServerInstance->Logs->Log("MODE", DEBUG, "ERROR: Destructor for mode %c called while not culled", mode);
 }
 
 bool ModeHandler::IsListMode()
@@ -392,22 +397,15 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                return;
        }
 
-       std::string mode_sequence = parameters[1];
+       ModResult MOD_RESULT;
+       FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters));
 
        bool SkipAccessChecks = false;
 
-       if (!IS_LOCAL(user) || ServerInstance->ULine(user->server))
-       {
+       if (!IS_LOCAL(user) || ServerInstance->ULine(user->server) || MOD_RESULT == MOD_RES_ALLOW)
                SkipAccessChecks = true;
-       }
-       else
-       {
-               ModResult MOD_RESULT;
-               FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters));
-               if (MOD_RESULT == MOD_RES_DENY)
-                       return;
-               SkipAccessChecks = (MOD_RESULT == MOD_RES_ALLOW);
-       }
+       else if (MOD_RESULT == MOD_RES_DENY)
+               return;
 
        if (targetuser && !SkipAccessChecks && user != targetuser)
        {
@@ -415,6 +413,8 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                return;
        }
 
+       std::string mode_sequence = parameters[1];
+
        std::string output_mode;
        std::ostringstream output_parameters;
        LastParseParams.push_back(output_mode);
@@ -664,7 +664,7 @@ bool ModeParser::DelMode(ModeHandler* mh)
        mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
        pos = (mh->GetModeChar()-65) | mask;
 
-       if (!modehandlers[pos])
+       if (modehandlers[pos] != mh)
                return false;
 
        /* Note: We can't stack here, as we have modes potentially being removed across many different channels.
@@ -1028,5 +1028,8 @@ ModeParser::~ModeParser()
 {
        ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
        if (mh)
+       {
+               mh->cull();
                delete mh;
+       }
 }