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

Update record pointer loading

Browse Source
This commit is contained in:
Alexei Kotov 2023-09-10 02:45:51 +03:00
parent 6872c7144e
commit 878d4ddaa7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/nif/recordptr.hpp
View File

@ -1,9 +1,10 @@
#ifndef OPENMW_COMPONENTS_NIF_RECORDPTR_HPP #ifndef OPENMW_COMPONENTS_NIF_RECORDPTR_HPP
#define OPENMW_COMPONENTS_NIF_RECORDPTR_HPP #define OPENMW_COMPONENTS_NIF_RECORDPTR_HPP
#include <vector>
#include "niffile.hpp" #include "niffile.hpp"
#include "nifstream.hpp" #include "nifstream.hpp"
#include <vector>
namespace Nif namespace Nif
{ {
@ -39,7 +40,7 @@ namespace Nif
assert(index == -2); assert(index == -2);
// Store the index for later // Store the index for later
index = nif->getInt(); index = nif->get<int32_t>();
assert(index >= -1); assert(index >= -1);
} }
@ -90,12 +91,13 @@ namespace Nif
template <class T> template <class T>
void readRecordList(NIFStream* nif, RecordListT<T>& list) void readRecordList(NIFStream* nif, RecordListT<T>& list)
{ {
const int length = nif->getInt(); const std::uint32_t length = nif->get<std::uint32_t>();
if (length < 0) // No reasonable list can hit this generous limit
throw std::runtime_error("Negative NIF record list length: " + std::to_string(length)); if (length >= (1 << 24))
throw std::runtime_error("Record list too long: " + std::to_string(length));
list.resize(static_cast<std::size_t>(length)); list.resize(length);
for (auto& value : list) for (auto& value : list)
value.read(nif); value.read(nif);