X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channames.cpp;h=b5f5853e739bfc0acfbf7af0bf9c54d9cf6af254;hb=9cdf47629faeec64edc77ff0729dc55946ed753c;hp=92774edff7575230ebb350ef1f1d784471851d37;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 92774edff..b5f5853e7 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -55,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);
 	}
 
@@ -86,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);