1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 11:09:43 +00:00

Merge pull request #2255 from elsid/fix_esm_ub

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

View file

@ -104,7 +104,7 @@ namespace ESM
}
mScriptData.resize(subSize);
esm.getExact(&mScriptData[0], mScriptData.size());
esm.getExact(mScriptData.data(), mScriptData.size());
break;
}
case ESM::FourCC<'S','C','T','X'>::value:
@ -156,7 +156,7 @@ namespace ESM
}
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.writeHNOString("SCTX", mScriptText);