Put serialized_items on the heap to prevent weird crashes on shutdown from the list being destructed before members in it

2 files changed, 15 insertions, 11 deletions

diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp
index f17ed6fd1..b913b8529 100644
--- a/modules/database/db_flatfile.cpp
+++ b/modules/database/db_flatfile.cpp
@@ -158,16 +158,17 @@ class DBFlatFile : public Module
 			return EVENT_CONTINUE;
 		}
 
-		for (std::list<SerializableBase *>::iterator it = serialized_items.begin(), it_end = serialized_items.end(); it != it_end; ++it)
-		{
-			SerializableBase *base = *it;
-			SerializableBase::serialized_data data = base->serialize();
-
-			db << "OBJECT " << base->serialize_name() << "\n";
-			for (SerializableBase::serialized_data::iterator dit = data.begin(), dit_end = data.end(); dit != dit_end; ++dit)
-				db << "DATA " << dit->first << " " << dit->second.astr() << "\n";
-			db << "END\n";
-		}
+		if (serialized_items != NULL)
+			for (std::list<SerializableBase *>::iterator it = serialized_items->begin(), it_end = serialized_items->end(); it != it_end; ++it)
+			{
+				SerializableBase *base = *it;
+				SerializableBase::serialized_data data = base->serialize();
+	
+				db << "OBJECT " << base->serialize_name() << "\n";
+				for (SerializableBase::serialized_data::iterator dit = data.begin(), dit_end = data.end(); dit != dit_end; ++dit)
+					db << "DATA " << dit->first << " " << dit->second.astr() << "\n";
+				db << "END\n";
+			}
 
 		db.close();
 
diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp
index 43e7cfe6d..d411d8b6d 100644
--- a/modules/database/db_sql.cpp
+++ b/modules/database/db_sql.cpp
@@ -113,8 +113,11 @@ class DBSQL : public Module
 			return EVENT_CONTINUE;
 		}
 
+		if (serialized_items == NULL)
+			return EVENT_CONTINUE;
+
 		std::map<Anope::string, SerializableBase::serialized_data> table_layout;
-		for (std::list<SerializableBase *>::iterator it = serialized_items.begin(), it_end = serialized_items.end(); it != it_end; ++it)
+		for (std::list<SerializableBase *>::iterator it = serialized_items->begin(), it_end = serialized_items->end(); it != it_end; ++it)
 		{
 			SerializableBase *base = *it;
 			SerializableBase::serialized_data data = base->serialize();