mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:23:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'range-safety' into 'master'

Browse source 
Make script literal lookup functions safer

See merge request OpenMW/openmw!113
This commit is contained in:
Alexei Dobrohotov 2019-12-18 15:27:49 +00:00
commit f3e8fbfded
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
components/interpreter/runtime.cpp
View file

@ -15,7 +15,8 @@ namespace Interpreter
int Runtime::getIntegerLiteral (int index) const int Runtime::getIntegerLiteral (int index) const
{ {
assert (index>=0 && index<static_cast<int> (mCode[1])); if (index < 0 || index >= static_cast<int> (mCode[1]))
throw std::out_of_range("out of range");
const Type_Code *literalBlock = mCode + 4 + mCode[0]; const Type_Code *literalBlock = mCode + 4 + mCode[0];
@ -24,7 +25,8 @@ namespace Interpreter
float Runtime::getFloatLiteral (int index) const float Runtime::getFloatLiteral (int index) const
{ {
assert (index>=0 && index<static_cast<int> (mCode[2])); if (index < 0 || index >= static_cast<int> (mCode[2]))
throw std::out_of_range("out of range");
const Type_Code *literalBlock = mCode + 4 + mCode[0] + mCode[1]; const Type_Code *literalBlock = mCode + 4 + mCode[0] + mCode[1];
@ -33,7 +35,8 @@ namespace Interpreter
std::string Runtime::getStringLiteral (int index) const std::string Runtime::getStringLiteral (int index) const
{ {
assert (index>=0 && static_cast<int> (mCode[3])>0); if (index < 0 || static_cast<int> (mCode[3]) <= 0)
throw std::out_of_range("out of range");
const char *literalBlock = const char *literalBlock =
reinterpret_cast<const char *> (mCode + 4 + mCode[0] + mCode[1] + mCode[2]); reinterpret_cast<const char *> (mCode + 4 + mCode[0] + mCode[1] + mCode[2]);
@ -43,7 +46,8 @@ namespace Interpreter
for (; index; --index) for (; index; --index)
{ {
offset += std::strlen (literalBlock+offset) + 1; offset += std::strlen (literalBlock+offset) + 1;
assert (offset/4<static_cast<int> (mCode[3])); if (offset / 4 >= static_cast<int> (mCode[3]))
throw std::out_of_range("out of range");
} }
return literalBlock+offset; return literalBlock+offset;