zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 21:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed overflows in String.Mid

Browse source
This commit is contained in:
ZZYZX 2017-02-06 14:22:13 +02:00 committed by Christoph Oelckers
parent 124d025131
commit f368e70f89
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/scripting/thingdef_data.cpp
View file

@ -1141,13 +1141,16 @@ DEFINE_ACTION_FUNCTION(FStringStruct, AppendFormat)
DEFINE_ACTION_FUNCTION(FStringStruct, Mid) DEFINE_ACTION_FUNCTION(FStringStruct, Mid)
{ {
PARAM_SELF_STRUCT_PROLOGUE(FString); PARAM_SELF_STRUCT_PROLOGUE(FString);
PARAM_INT(pos); PARAM_INT(ipos);
PARAM_INT(len); PARAM_INT(ilen);
// validate. we don't want to crash if someone passes negative values. // validate. we don't want to crash if someone passes negative values.
// with size_t it's handled naturally I think, as it's unsigned, but not in ZScript. // with size_t it's handled naturally I think, as it's unsigned, but not in ZScript.
if (pos < 0) pos = 0; if (ipos < 0) ipos = 0;
if (len < 0) len = 0; if (ilen < 0) ilen = 0;
int slen = self->Len(); // convert to size_t to prevent overflows here
size_t slen = self->Len();
size_t pos = (size_t)ipos;
size_t len = (size_t)ilen;
if (pos > slen) pos = slen - 1; if (pos > slen) pos = slen - 1;
if (pos + len > slen) if (pos + len > slen)
len = slen - pos; len = slen - pos;