From 07902c03fde41205e5366b852553f1c74c9746dd Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sat, 28 Jun 2014 23:14:48 -0400
Subject: Check that the list of items isn't NULL when destructing types

---
 src/serialize.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/serialize.cpp')

diff --git a/src/serialize.cpp b/src/serialize.cpp
index 570463dc3..1bb704b41 100644
--- a/src/serialize.cpp
+++ b/src/serialize.cpp
@@ -125,13 +125,14 @@ 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;
-	}
+	if (Serializable::SerializableItems != NULL)
+		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())
-- 
cgit