Changeset 10298

Timestamp:

Mar 2, 2015, 11:18:45 PM (9 years ago)

Author:

landauf

Message:

fixed potential crash during level-unloading: Namespace is a context and is thus potentially used by other objects → store a smartPtr on the namespace object

Location:

code/trunk/src/libraries/core

Files:

• BaseObject.h (modified) (2 diffs)
• Namespace.cc (modified) (1 diff)

code/trunk/src/libraries/core/BaseObject.h

@@ -138 +138 @@
                 { return this->templates_; }
 
-            virtual inline void setNamespace(Namespace* ns) { this->namespace_ = ns; }
-            inline Namespace* getNamespace() const { return this->namespace_; }
+            inline void setNamespace(const SmartPtr<Namespace>& ns) { this->namespace_ = ns; }
+            inline const SmartPtr<Namespace>& getNamespace() const { return this->namespace_; }
 
             inline void setCreator(BaseObject* creator) { this->creator_ = creator; }
@@ -222 +222 @@
             std::map<std::string, std::string> xmlAttributes_; //!< Lowercase XML attributes
             std::string            loaderIndentation_;         //!< Indentation of the debug output in the Loader
-            Namespace*             namespace_;
+            SmartPtr<Namespace>    namespace_;
             BaseObject*            creator_;
             SmartPtr<Scene>        scene_;

code/trunk/src/libraries/core/Namespace.cc

@@ -46 +46 @@
     {
         RegisterObject(Namespace);
+
+        this->setNamespace(SmartPtr<Namespace>(this, false));
     }