mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 15:15:31 +00:00
Code Issues Releases Wiki Activity

Continue loading esm after detecting string table overflow condition. Should resolve bug #1774.

Browse source
This commit is contained in:
cc9cii 2014-08-10 12:54:54 +10:00
parent 42dceb641e
commit c43bd3c345
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/esm/loadscpt.cpp
View file

@ -38,13 +38,28 @@ void Script::load(ESMReader &esm)
char* str = &tmp[0]; char* str = &tmp[0];
for (size_t i = 0; i < mVarNames.size(); i++) for (size_t i = 0; i < mVarNames.size(); i++)
{ {
// Support '\r' terminated strings like vanilla. See Bug #1324.
char *termsym = strchr(str, '\r'); char *termsym = strchr(str, '\r');
if(termsym) *termsym = '\0'; if(termsym) *termsym = '\0';
mVarNames[i] = std::string(str); mVarNames[i] = std::string(str);
str += mVarNames[i].size() + 1; str += mVarNames[i].size() + 1;
if (str - &tmp[0] > s) if (str - &tmp[0] > s)
esm.fail("String table overflow"); {
// Apparently SCVR subrecord is not used and variable names are
// determined on the fly from the script text. Therefore don't throw
// an exeption, just log an error and continue.
std::stringstream ss;
ss << "ESM Error: " << "String table overflow";
ss << "\n File: " << esm.getName();
ss << "\n Record: " << esm.getContext().recName.toString();
ss << "\n Subrecord: " << "SCVR";
ss << "\n Offset: 0x" << std::hex << esm.getFileOffset();
std::cout << ss.str() << std::endl;
break;
}
} }
} }