mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-30 11:04:32 +00:00
Code Issues Releases Wiki Activity

Replace asserts by exceptions in RecordPtrT

Browse source 
It's possible to fail when reading nif file.
This commit is contained in:
elsid 2025-09-19 20:00:31 +02:00
parent aa4caae2bf
commit 20c388a410
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/nif/recordptr.hpp
View file

@ -1,6 +1,9 @@
#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 <format>
#include <stdexcept>
#include <typeinfo>
#include <vector> #include <vector>
#include "niffile.hpp" #include "niffile.hpp"
@ -40,8 +43,11 @@ namespace Nif
assert(mIndex == -2); assert(mIndex == -2);
// Store the index for later // Store the index for later
mIndex = nif->get<int32_t>(); const int32_t index = nif->get<int32_t>();
assert(mIndex >= -1); if (index < -1)
throw std::runtime_error(std::format("Invalid index: {}", index));
mIndex = index;
} }
/// Resolve index to pointer /// Resolve index to pointer
@ -51,10 +57,14 @@ namespace Nif
mPtr = nullptr; mPtr = nullptr;
else else
{ {
Record* r = nif.getRecord(mIndex); Record* const r = nif.getRecord(mIndex);
if (r == nullptr)
throw std::runtime_error(std::format("Record at {} is nullptr", mIndex));
// And cast it // And cast it
mPtr = dynamic_cast<X*>(r); mPtr = dynamic_cast<X*>(r);
assert(mPtr != nullptr); if (mPtr == nullptr)
throw std::runtime_error(std::format("Failed to cast record pointer to {}", typeid(X).name()));
} }
} }