Fix memory leak and invalid vtable location on unload of m_sslinfo

[user/henk/code/inspircd.git] / src / modules / m_inviteexception.cpp

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 5acdf4f97f63e0872f75b34c7f6bb88780163d45..29d7eb5d5a2ad453e38b06c1fd90bfb61d89001f 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -34,14 +34,14 @@ class InspIRCd* ServerInstance;
 class InviteException : public ListModeBase
 {
  public:
-       InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
+       InviteException(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
 };
 
 class ModuleInviteException : public Module
 {
        InviteException ie;
 public:
-       ModuleInviteException(InspIRCd* Me) : Module(Me), ie(Me)
+       ModuleInviteException(InspIRCd* Me) : Module(Me), ie(Me, this)
        {
                if (!ServerInstance->Modes->AddMode(&ie))
                        throw ModuleException("Could not add new modes!");
@@ -57,7 +57,7 @@ public:
                output.append(" INVEX=I");
        }
 
-       virtual int OnCheckInvite(User* user, Channel* chan)
+       virtual ModResult OnCheckInvite(User* user, Channel* chan)
        {
                if(chan != NULL)
                {
@@ -71,14 +71,14 @@ public:
                                        if(InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
                                        {
                                                // They match an entry on the list, so let them in.
-                                               return 1;
+                                               return MOD_RES_DENY;
                                        }
                                }
                        }
                        // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual const char* OnRequest(Request* request)