gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r24153) -Fix [FS#5160]: [Squirrel] Crash when trying to create an array with negative size

Browse Source
This commit is contained in:
rubidium 2012-04-18 19:22:32 +00:00
parent 8d56856791
commit a355e123fc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/3rdparty/squirrel/squirrel/sqbaselib.cpp vendored
View File

@ -210,16 +210,22 @@ static SQInteger base_suspend(HSQUIRRELVM v)
static SQInteger base_array(HSQUIRRELVM v) static SQInteger base_array(HSQUIRRELVM v)
{ {
SQArray *a; SQArray *a;
SQObject &size = stack_get(v,2); SQInteger nInitialSize = tointeger(stack_get(v,2));
SQInteger ret = 1;
if (nInitialSize < 0) {
v->Raise_Error(_SC("can't create/resize array with/to size %d"), nInitialSize);
nInitialSize = 0;
ret = -1;
}
if(sq_gettop(v) > 2) { if(sq_gettop(v) > 2) {
a = SQArray::Create(_ss(v),0); a = SQArray::Create(_ss(v),0);
a->Resize(tointeger(size),stack_get(v,3)); a->Resize(nInitialSize,stack_get(v,3));
} }
else { else {
a = SQArray::Create(_ss(v),tointeger(size)); a = SQArray::Create(_ss(v),nInitialSize);
} }
v->Push(a); v->Push(a);
return 1; return ret;
} }
static SQInteger base_type(HSQUIRRELVM v) static SQInteger base_type(HSQUIRRELVM v)