Hold a reference to the type in Serialize::Checker in the event it goes away, and invalidate the type pointer of objects when the type goes away

1 files changed, 9 insertions, 0 deletions

diff --git a/src/serialize.cpp b/src/serialize.cpp
index 521704df4..570463dc3 100644
--- a/src/serialize.cpp
+++ b/src/serialize.cpp
@@ -124,6 +124,15 @@ Type::Type(const Anope::string &n, unserialize_func f, Module *o)  : name(n), un
 
 Type::~Type()
 {
+	/* null the type of existing serializable objects of this type */
+	for (std::list<Serializable *>::iterator it = Serializable::SerializableItems->begin(); it != Serializable::SerializableItems->end(); ++it)
+	{
+		Serializable *s = *it;
+
+		if (s->s_type == this)
+			s->s_type = NULL;
+	}
+
 	std::vector<Anope::string>::iterator it = std::find(TypeOrder.begin(), TypeOrder.end(), this->name);
 	if (it != TypeOrder.end())
 		TypeOrder.erase(it);