mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 18:59:57 +00:00
Code Issues Releases Wiki Activity

Replace all the asserts with throw in components/esm4/reader.cpp

Browse source
This commit is contained in:
jvoisin 2023-05-22 17:38:33 +02:00
parent 45c84a2426
commit 8b654f276d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/esm4/reader.cpp
View file

@ -28,7 +28,6 @@
#undef DEBUG_GROUPSTACK
#include <cassert>
#include <iomanip> // for debugging
#include <iostream> // for debugging
#include <sstream> // for debugging
@ -178,7 +177,8 @@ namespace ESM4
openRaw(std::move(stream), filename);
// should at least have the size of ESM3 record header (20 or 24 bytes for ESM4)
assert(mFileSize >= 16);
if (mFileSize < 16)
throw std::runtime_error("File too small");
std::uint32_t modVer = 0;
if (getExact(modVer)) // get the first 4 bytes of the record header only
{
@ -404,7 +404,8 @@ namespace ESM4
void Reader::skipRecordData()
{
assert(mCtx.recordRead <= mCtx.recordHeader.record.dataSize && "Skipping after reading more than available");
if (mCtx.recordRead > mCtx.recordHeader.record.dataSize)
throw std::runtime_error("Skipping after reading more than available");
mStream->ignore(mCtx.recordHeader.record.dataSize - mCtx.recordRead);
mCtx.recordRead = mCtx.recordHeader.record.dataSize; // for getSubRecordHeader()
}
@ -514,7 +515,9 @@ namespace ESM4
mCtx.groupStack.back().second += lastGroupSize;
lastGroupSize = mCtx.groupStack.back().first.groupSize;
assert(lastGroupSize >= mCtx.groupStack.back().second && "Read more records than available");
if (lastGroupSize < mCtx.groupStack.back().second)
throw std::runtime_error("Read more records than available");
// #if 0
if (mCtx.groupStack.back().second > lastGroupSize) // FIXME: debugging only
std::cerr << printLabel(mCtx.groupStack.back().first.label, mCtx.groupStack.back().first.type)
@ -537,7 +540,8 @@ namespace ESM4
void Reader::skipGroupData()
{
assert(!mCtx.groupStack.empty() && "Skipping group with an empty stack");
if (mCtx.groupStack.empty())
throw std::runtime_error("Skipping group with an empty stack");
// subtract what was already read/skipped
std::uint32_t skipSize = mCtx.groupStack.back().first.groupSize - mCtx.groupStack.back().second;
@ -572,8 +576,8 @@ namespace ESM4
const CellGrid& Reader::currCellGrid() const
{
// Maybe should throw an exception instead?
assert(mCtx.cellGridValid && "Attempt to use an invalid cell grid");
if (!mCtx.cellGridValid)
throw std::runtime_error("Attempt to use an invalid cell grid");
return mCtx.currCellGrid;
}