Replace DummyExtItem with a flag in Extensible

2 files changed, 8 insertions, 8 deletions

diff --git a/include/extensible.h b/include/extensible.h
index 4e6721414..a0544bba1 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -84,6 +84,11 @@ class CoreExport Extensible : public classbase
 	 * Holds all extensible metadata for the class.
 	 */
 	ExtensibleStore extensions;
+
+	/** True if this Extensible has been culled.
+	 * A warning is generated if false on destruction.
+	 */
+	unsigned int culled:1;
  public:
 	/**
 	 * Get the extension items for iteraton (i.e. for metadata sync during netburst)
diff --git a/src/base.cpp b/src/base.cpp
index cf28f8e7d..dc57a8434 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -174,20 +174,15 @@ void Extensible::doUnhookExtensions(const std::vector<reference<ExtensionItem> >
 	}
 }
 
-static struct DummyExtensionItem : LocalExtItem
-{
-	DummyExtensionItem() : LocalExtItem("", NULL) {}
-	void free(void*) {}
-} dummy;
-
 Extensible::Extensible()
+	: culled(false)
 {
-	extensions[&dummy] = NULL;
 }
 
 CullResult Extensible::cull()
 {
 	FreeAllExtItems();
+	culled = true;
 	return classbase::cull();
 }
 
@@ -202,7 +197,7 @@ void Extensible::FreeAllExtItems()
 
 Extensible::~Extensible()
 {
-	if (!extensions.empty() && ServerInstance && ServerInstance->Logs)
+	if ((!extensions.empty() || !culled) && ServerInstance && ServerInstance->Logs)
 		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Extensible destructor called without cull @%p", (void*)this);
 }