Fix infinite loop on alias expansion, found by Adam

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

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index ebb5a0038993a50ace37368204f39ab95456b20b..0220a3a44eedeb1e4b7d3260f5c4b67a40623db4 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -28,7 +28,7 @@ enum FilterFlags
        FLAG_NOTICE = 16
 };
 
-class FilterResult : public classbase
+class FilterResult
 {
  public:
        std::string freeform;
@@ -145,7 +145,7 @@ protected:
        virtual ModResult OnStats(char symbol, User* user, string_list &results) = 0;
        virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line);
        bool AppliesToMe(User* user, FilterResult* filter, int flags);
-       void OnLoadModule(Module* mod, const std::string& name);
+       void OnLoadModule(Module* mod);
        virtual void ReadFilters(ConfigReader &MyConf) = 0;
 };
 
@@ -443,7 +443,7 @@ void FilterBase::OnRehash(User* user)
        {
                for (modulelist::iterator i = ml->begin(); i != ml->end(); ++i)
                {
-                       if (RegexNameRequest(this, *i).Send() == newrxengine)
+                       if (RegexNameRequest(this, *i).result == newrxengine)
                        {
                                ServerInstance->SNO->WriteGlobalSno('a', "Filter now using engine '%s'", RegexEngine.c_str());
                                rxengine = *i;
@@ -456,11 +456,11 @@ void FilterBase::OnRehash(User* user)
        }
 }
 
-void FilterBase::OnLoadModule(Module* mod, const std::string& name)
+void FilterBase::OnLoadModule(Module* mod)
 {
        if (ServerInstance->Modules->ModuleHasInterface(mod, "RegularExpression"))
        {
-               std::string rxname = RegexNameRequest(this, mod).Send();
+               std::string rxname = RegexNameRequest(this, mod).result;
                if (rxname == RegexEngine)
                {
                        rxengine = mod;
@@ -477,7 +477,7 @@ void FilterBase::OnLoadModule(Module* mod, const std::string& name)
 
 Version FilterBase::GetVersion()
 {
-       return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON, API_VERSION);
+       return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON);
 }