Fixed crashes with not initialized CustomData

This commit is contained in:
Yehonal
2018-03-01 14:20:46 +00:00
parent 93cf5edd57
commit a36e94a49a
2 changed files with 5 additions and 0 deletions

View File

@@ -28,6 +28,9 @@ public:
*/
template<class T> T* Get(std::string const & k) const {
static_assert(std::is_base_of<Base, T>::value, "T must derive from Base");
if (Container.empty())
return nullptr;
auto it = Container.find(k);
if (it != Container.end())
return dynamic_cast<T*>(it->second.get());

View File

@@ -71,6 +71,8 @@ Object::Object() : m_PackGUID(sizeof(uint64)+1)
m_inWorld = false;
m_objectUpdated = false;
CustomData.Set("base",new DataMap::Base); // avoid crash when access not initialized CustomData
m_PackGUID.appendPackGUID(0);
}