mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-11 16:41:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2255 from elsid/fix_esm_ub

Browse source 
Use std::vector::data method to avoid reference binding to null pointer
This commit is contained in:
Bret Curtis 2019-03-16 20:46:09 +01:00 committed by GitHub
commit adb96bf569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/esm/loadscpt.cpp
View file

@ -104,7 +104,7 @@ namespace ESM
} }
mScriptData.resize(subSize); mScriptData.resize(subSize);
esm.getExact(&mScriptData[0], mScriptData.size()); esm.getExact(mScriptData.data(), mScriptData.size());
break; break;
} }
case ESM::FourCC<'S','C','T','X'>::value: case ESM::FourCC<'S','C','T','X'>::value:
@ -156,7 +156,7 @@ namespace ESM
} }
esm.startSubRecord("SCDT"); esm.startSubRecord("SCDT");
esm.write(reinterpret_cast<const char * >(&mScriptData[0]), mData.mScriptDataSize); esm.write(reinterpret_cast<const char *>(mScriptData.data()), mData.mScriptDataSize);
esm.endRecord("SCDT"); esm.endRecord("SCDT");
esm.writeHNOString("SCTX", mScriptText); esm.writeHNOString("SCTX", mScriptText);