mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:23:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_crash' into 'master'

Browse source 
Fix an off-by-one in loadscpt

See merge request OpenMW/openmw!728
This commit is contained in:
Evil Eye 2021-04-16 18:02:47 +00:00
commit 80266d435c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/esm/loadscpt.cpp
View file

@ -30,7 +30,7 @@ namespace ESM
// The tmp buffer is a null-byte separated string list, we // The tmp buffer is a null-byte separated string list, we
// just have to pick out one string at a time. // just have to pick out one string at a time.
char* str = tmp.data(); char* str = tmp.data();
if (!str) if (tmp.empty())
{ {
if (mVarNames.size() > 0) if (mVarNames.size() > 0)
Log(Debug::Warning) << "SCVR with no variable names"; Log(Debug::Warning) << "SCVR with no variable names";
@ -51,6 +51,7 @@ namespace ESM
ss << "\n Subrecord: " << "SCVR"; ss << "\n Subrecord: " << "SCVR";
ss << "\n Offset: 0x" << std::hex << esm.getFileOffset(); ss << "\n Offset: 0x" << std::hex << esm.getFileOffset();
Log(Debug::Verbose) << ss.str(); Log(Debug::Verbose) << ss.str();
str = tmp.data();
} }
for (size_t i = 0; i < mVarNames.size(); i++) for (size_t i = 0; i < mVarNames.size(); i++)