eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 00:49:19 +02:00
Code Issues 121 Wiki Activity

Prevent crashing simulator on invalid e3d file header

Browse Source
This commit is contained in:
Hirek
2025-10-14 18:13:54 +02:00
parent 761fda99eb
commit d419129363
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Model3d.cpp
View File

@@ -2246,13 +2246,20 @@ void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic)
uint32_t type = sn_utils::ld_uint32(file); uint32_t type = sn_utils::ld_uint32(file);
uint32_t size = sn_utils::ld_uint32(file) - 8; uint32_t size = sn_utils::ld_uint32(file) - 8;
if (type != MAKE_ID4('E', '3', 'D', '0')) if (type == MAKE_ID4('E', '3', 'D', '0'))
throw std::runtime_error("e3d: unknown main chunk"); {
deserialize(file, size, dynamic); deserialize(file, size, dynamic);
file.close(); file.close();
WriteLog("Finished loading 3d model data from \"" + FileName + "\"", logtype::model); WriteLog("Finished loading 3d model data from \"" + FileName + "\"", logtype::model);
}
else
{
//throw std::runtime_error("e3d: unknown main chunk");
ErrorLog("Bad model: unknown main chunk in file \"" + FileName + "\"", logtype::model);
file.close();
}
}; };
TSubModel* TModel3d::AppendChildFromGeometry(const std::string &name, const std::string &parent, const gfx::vertex_array &vertices, const gfx::index_array &indices) TSubModel* TModel3d::AppendChildFromGeometry(const std::string &name, const std::string &parent, const gfx::vertex_array &vertices, const gfx::index_array &indices)