Merge pull request #1147 from SaberUK/insp20+gcc6

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

diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index 541a56e5491c7116324ac74af8e4376766578aa0..cf77ae9ba75ac99b5cce271eb71e82608c7b7fbd 100644 (file)
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -25,9 +25,10 @@ class ModuleServerBan : public Module
 {
  private:
  public:
-       ModuleServerBan()       {
+       void init()
+       {
                Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ~ModuleServerBan()
@@ -41,7 +42,7 @@ class ModuleServerBan : public Module
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (mask[0] == 's' && mask[1] == ':')
+               if ((mask.length() > 2) && (mask[0] == 's') && (mask[1] == ':'))
                {
                        if (InspIRCd::Match(user->server, mask.substr(2)))
                                return MOD_RES_DENY;