From 04be1526b24b77c1f9bb13b4f1fc5a54f2683c9d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 18 Jun 2023 19:49:49 +0400
Subject: [PATCH] Add a safeguard to load only supported records

---
 apps/openmw/mwworld/store.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index c3d5dd839b..49b28d7f14 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -210,21 +210,28 @@ namespace MWWorld
     template <class T, class Id>
     RecordId TypedDynamicStore<T, Id>::load(ESM::ESMReader& esm)
     {
-        T record;
-        bool isDeleted = false;
         if constexpr (!ESM::isESM4Rec(T::sRecordId))
         {
+            T record;
+            bool isDeleted = false;
             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
-            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>