X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=59196fec1d6242fb1ca1a3f6ffad4cacd915517f;hb=a8878569083bfa4753e9e118adee0ed1da6a0325;hp=15a642eb403aa2145409b63b4262ea9b86e20e3d;hpb=93a78a57ada6d5dab410c2bd3c4b02f4fa15684c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/base.cpp b/src/base.cpp
index 15a642eb4..59196fec1 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -136,17 +136,32 @@ void Extensible::doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove)
 	}
 }
 
+static struct DummyExtensionItem : LocalExtItem
+{
+	DummyExtensionItem() : LocalExtItem("", NULL) {}
+	void free(void*) {}
+} dummy;
+
+Extensible::Extensible()
+{
+	extensions[&dummy] = NULL;
+}
+
 CullResult Extensible::cull()
 {
 	for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
 	{
-		i->first->free(i->second);	
+		i->first->free(i->second);
 	}
+	extensions.clear();
 	return classbase::cull();
 }
 
 Extensible::~Extensible()
 {
+	if (!extensions.empty() && ServerInstance && ServerInstance->Logs)
+		ServerInstance->Logs->Log("CULLLIST", DEBUG,
+			"Extensible destructor called without cull @%p", (void*)this);
 }
 
 LocalExtItem::LocalExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod)