Add limit parameter to decompressZlib

[minetest.git] / src / staticobject.cpp

diff --git a/src/staticobject.cpp b/src/staticobject.cpp
index b331ac2f2b7557d8c84bd6432509a352ac779db9..bebca12ecabe0b48e4ae2c2d1e7d33481c592031 100644 (file)
--- a/src/staticobject.cpp
+++ b/src/staticobject.cpp
@@ -77,6 +77,15 @@ void StaticObjectList::serialize(std::ostream &os)
 }
 void StaticObjectList::deSerialize(std::istream &is)
 {
+       if (m_active.size()) {
+               errorstream << "StaticObjectList::deSerialize(): "
+                       << "deserializing objects while " << m_active.size()
+                       << " active objects already exist (not cleared). "
+                       << m_stored.size() << " stored objects _were_ cleared"
+                       << std::endl;
+       }
+       m_stored.clear();
+
        // version
        u8 version = readU8(is);
        // count