Remove Command and ModeHandler objects in their destructors; fixes possible pointer leak if a module was not careful when triggering exceptions in its constructor

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11872 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 11 insertions, 58 deletions

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index c8ca7d59e..fe0aab3b9 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "xline.h"
 #include "socketengine.h"
@@ -396,24 +394,16 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 	}
 }
 
-void CommandParser::RemoveCommands(Module* source)
+void CommandParser::RemoveCommand(Command* x)
 {
-	Commandtable::iterator i,safei;
-	for (i = cmdlist.begin(); i != cmdlist.end();)
-	{
-		safei = i;
-		i++;
-		RemoveCommand(safei, source);
-	}
+	Commandtable::iterator n = cmdlist.find(x->command);
+	if (n != cmdlist.end() && n->second == x)
+		cmdlist.erase(n);
 }
 
-void CommandParser::RemoveCommand(Commandtable::iterator safei, Module* source)
+Command::~Command()
 {
-	Command* x = safei->second;
-	if (x->creator == source)
-	{
-		cmdlist.erase(safei);
-	}
+	ServerInstance->Parser->RemoveCommand(this);
 }
 
 bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
@@ -426,7 +416,7 @@ bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
 	return ProcessCommand(user,buffer);
 }
 
-bool CommandParser::CreateCommand(Command *f)
+bool CommandParser::AddCommand(Command *f)
 {
 	/* create the command and push it onto the table */
 	if (cmdlist.find(f->command) == cmdlist.end())
diff --git a/src/mode.cpp b/src/mode.cpp
index c37407223..1ac2b9e64 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -57,6 +57,7 @@ ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modelett
 
 ModeHandler::~ModeHandler()
 {
+	ServerInstance->Modes->DelMode(this);
 }
 
 bool ModeHandler::IsListMode()
@@ -690,22 +691,6 @@ bool ModeParser::DelMode(ModeHandler* mh)
 	return true;
 }
 
-void ModeParser::RemoveModes(Module* mod)
-{
-	for(int i=0; i < 256; i++)
-	{
-		ModeHandler* mh = modehandlers[i];
-		if (mh && mh->creator == mod)
-			DelMode(mh);
-		for(unsigned int j=0; j < modewatchers[i].size(); j++)
-		{
-			ModeWatcher* mw = modewatchers[i][j];
-			if (mw && mw->creator == mod)
-				DelModeWatcher(mw);
-		}
-	}
-}
-
 ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt)
 {
 	unsigned char mask = 0;
diff --git a/src/modules.cpp b/src/modules.cpp
index 1c4f47103..71363ae9d 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -474,9 +474,6 @@ bool ModuleManager::Unload(const char* filename)
 
 		this->DetachAll(modfind->second);
 
-		ServerInstance->Parser->RemoveCommands(modfind->second);
-		ServerInstance->Modes->RemoveModes(modfind->second);
-
 		ServerInstance->GlobalCulls.AddItem(modfind->second);
 		Modules.erase(modfind);
 
@@ -495,7 +492,7 @@ bool ModuleManager::Unload(const char* filename)
 void ModuleManager::LoadAll()
 {
 	char configToken[MAXBUF];
-	ModCount = -1;
+	ModCount = 0;
 
 	printf("\nLoading core commands");
 	fflush(stdout);
@@ -670,24 +667,6 @@ const std::string& ModuleManager::GetModuleName(Module* m)
 	return nothing;
 }
 
-/* This is ugly, yes, but hash_map's arent designed to be
- * addressed in this manner, and this is a bit of a kludge.
- * Luckily its a specialist function and rarely used by
- * many modules (in fact, it was specially created to make
- * m_safelist possible, initially).
- */
-
-Channel* InspIRCd::GetChannelIndex(long index)
-{
-	int target = 0;
-	for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
-	{
-		if (index == target)
-			return n->second;
-	}
-	return NULL;
-}
-
 CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
 {
 	return this->Parser->CallHandler(commandname, parameters, user);
@@ -700,10 +679,9 @@ bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, Us
 
 void InspIRCd::AddCommand(Command *f)
 {
-	if (!this->Parser->CreateCommand(f))
+	if (!this->Parser->AddCommand(f))
 	{
-		ModuleException err("Command "+std::string(f->command)+" already exists.");
-		throw (err);
+		throw ModuleException("Command "+std::string(f->command)+" already exists.");
 	}
 }