m_mysql Fix crash on rehash when the database tags have been changed in the config

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

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index f89b6ab009bfae90748e9dc0b96f35f510e83a9e..b5f5853e739bfc0acfbf7af0bf9c54d9cf6af254 100644 (file)
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Implements config tags which allow changing characters allowed in channel names */
@@ -49,12 +55,15 @@ class ModuleChannelNames : public Module
        bool badchan;
 
  public:
-       ModuleChannelNames() : rememberer(ServerInstance->IsChannel)
+       ModuleChannelNames() : rememberer(ServerInstance->IsChannel), badchan(false)
+       {
+       }
+
+       void init()
        {
                ServerInstance->IsChannel = &myhandler;
-               badchan = false;
                Implementation eventlist[] = { I_OnRehash, I_OnUserKick };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
@@ -80,18 +89,26 @@ class ModuleChannelNames : public Module
                                ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
                        }
                        const UserMembList* users = c->GetUsers();
-                       for(UserMembCIter j = users->begin(); j != users->end(); ++j)
+                       for(UserMembCIter j = users->begin(); j != users->end(); )
+                       {
                                if (IS_LOCAL(j->first))
-                                       c->KickUser(ServerInstance->FakeClient, j->first, "Channel name no longer valid");
+                               {
+                                       // KickUser invalidates the iterator
+                                       UserMembCIter it = j++;
+                                       c->KickUser(ServerInstance->FakeClient, it->first, "Channel name no longer valid");
+                               }
+                               else
+                                       ++j;
+                       }
                }
                badchan = false;
        }
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf;
-               std::string denyToken = Conf.ReadValue("channames", "denyrange", 0);
-               std::string allowToken = Conf.ReadValue("channames", "allowrange", 0);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("channames");
+               std::string denyToken = tag->getString("denyrange");
+               std::string allowToken = tag->getString("allowrange");
                allowedmap.set();
 
                irc::portparser denyrange(denyToken, false);