mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-22 07:21:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'esm4_fix' into 'master'

Browse Source 
Add a safeguard to load only supported records

Closes #7406

See merge request OpenMW/openmw!3158
This commit is contained in:
psi29a 2023-06-20 10:00:46 +00:00
commit a59f22fd30
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,21 +210,28 @@ namespace MWWorld
template <class T, class Id> template <class T, class Id>
RecordId TypedDynamicStore<T, Id>::load(ESM::ESMReader& esm) RecordId TypedDynamicStore<T, Id>::load(ESM::ESMReader& esm)
{ {
T record;
bool isDeleted = false;
if constexpr (!ESM::isESM4Rec(T::sRecordId)) if constexpr (!ESM::isESM4Rec(T::sRecordId))
{ {
T record;
bool isDeleted = false;
record.load(esm, isDeleted); record.load(esm, isDeleted);
std::pair<typename Static::iterator, bool> inserted = mStatic.insert_or_assign(record.mId, record);
if (inserted.second)
mShared.push_back(&inserted.first->second);
if constexpr (std::is_same_v<Id, ESM::RefId>)
return RecordId(record.mId, isDeleted);
else
return RecordId();
} }
std::pair<typename Static::iterator, bool> inserted = mStatic.insert_or_assign(record.mId, record);
if (inserted.second)
mShared.push_back(&inserted.first->second);
if constexpr (std::is_same_v<Id, ESM::RefId>)
return RecordId(record.mId, isDeleted);
else else
return RecordId(); {
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());
}
} }
template <class T, class Id> template <class T, class Id>