mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-21 18:40:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'save_safeguard' into 'master'

Browse Source 
Add a safeguard to do not use uninitialized value

See merge request OpenMW/openmw!3349
This commit is contained in:
psi29a 2023-08-19 09:31:00 +00:00
commit e5d5cbcdd1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/openmw/mwworld/store.cpp
View File

@ -355,12 +355,12 @@ namespace MWWorld
template <class T, class Id>
RecordId TypedDynamicStore<T, Id>::read(ESM::ESMReader& reader, bool overrideOnly)
{
T record;
bool isDeleted = false;
if constexpr (!ESM::isESM4Rec(T::sRecordId))
{
T record;
bool isDeleted = false;
record.load(reader, isDeleted);
}
insert(record, overrideOnly);
if constexpr (std::is_same_v<Id, ESM::RefId>)
@ -368,6 +368,14 @@ namespace MWWorld
else
return RecordId();
}
else
{
std::stringstream msg;
msg << "Can not load record of type ESM::REC_" << getRecNameString(T::sRecordId).toStringView()
<< ": ESM::ESMReader can load only ESM3 records.";
throw std::runtime_error(msg.str());
}
}
// LandTexture
//=========================================================================