🐛 Fixed segfault when ODEF mesh wasn't found.

RigsOfRods · Apr 9, 2021 · 7936a6b · 7936a6b
1 parent 2669a74
commit 7936a6b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/source/main/Application.h b/source/main/Application.h
@@ -32,6 +32,7 @@
 #include "Str.h"
 #include "ZeroedMemoryAllocator.h" // Legacy
 
+#include <fmt/format.h>
 #include <OgreStringConverter.h>
 
 #include <assert.h>

diff --git a/source/main/terrain/TerrainObjectManager.cpp b/source/main/terrain/TerrainObjectManager.cpp
@@ -579,8 +579,17 @@ void TerrainObjectManager::LoadTerrainObject(const Ogre::String& name, const Ogr
     {
         Str<100> ebuf; ebuf << m_entity_counter++ << "-" << odef->header.mesh_name;
         mo = new MeshObject(odef->header.mesh_name, m_resource_group, ebuf.ToCStr(), tenode);
-        mo->getEntity()->setCastShadows(odef->header.cast_shadows);
-        m_mesh_objects.push_back(mo);
+        if (mo->getEntity())
+        {
+            mo->getEntity()->setCastShadows(odef->header.cast_shadows);
+            m_mesh_objects.push_back(mo);
+        }
+        else
+        {
+            delete mo;
+            App::GetConsole()->putMessage(Console::CONSOLE_MSGTYPE_TERRN, Console::CONSOLE_SYSTEM_WARNING,
+                fmt::format("ODEF: Could not load mesh {}", odef->header.mesh_name));
+        }
     }
 
     tenode->setScale(odef->header.scale);