From 68e47f5ec2154aa97ff298d4516ca0caf746e51a Mon Sep 17 00:00:00 2001
From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Wed, 2 Sep 2009 00:46:44 +0000
Subject: Valgrind cleanup: finish destructor creation

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11615 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/command_parse.cpp | 3 +++
 src/dns.cpp           | 7 ++++++-
 src/timer.cpp         | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 3f8f63c48..efc295e5e 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -436,6 +436,9 @@ void CommandParser::RemoveRFCCommands()
 		dlclose(c->second);
 	}
 	RFCCommands.clear();
+	// special case: reload isn't in the RFCCommands list but is allocated anyway
+	Command* reload = cmdlist.find("RELOAD")->second;
+	delete reload;
 }
 
 void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source)
diff --git a/src/dns.cpp b/src/dns.cpp
index 5af3fd198..4d06e02ab 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -129,6 +129,10 @@ class RequestTimeout : public Timer
 	RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, SI->Time()), ServerInstance(SI), watch(watching), watchid(id)
 	{
 	}
+	~RequestTimeout()
+	{
+		Tick(0);
+	}
 
 	void Tick(time_t)
 	{
@@ -143,7 +147,6 @@ class RequestTimeout : public Timer
 			}
 			ServerInstance->Res->requests[watchid] = NULL;
 			delete watch;
-			return;
 		}
 	}
 };
@@ -876,6 +879,8 @@ DNS::~DNS()
 	ServerInstance->SE->Shutdown(this, 2);
 	ServerInstance->SE->Close(this);
 	ServerInstance->Timers->DelTimer(this->PruneTimer);
+	if (cache)
+		delete cache;
 }
 
 CachedQuery* DNS::GetCache(const std::string &source)
diff --git a/src/timer.cpp b/src/timer.cpp
index c58440c88..8dab38392 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -20,6 +20,12 @@ TimerManager::TimerManager(InspIRCd* Instance) : ServerInstance(Instance)
 {
 }
 
+TimerManager::~TimerManager()
+{
+	for(std::vector<Timer *>::iterator i = Timers.begin(); i != Timers.end(); i++)
+		delete *i;
+}
+
 void TimerManager::TickTimers(time_t TIME)
 {
 	while ((Timers.size()) && (TIME > (*Timers.begin())->GetTimer()))
-- 
cgit v1.2.3