mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-09 23:50:25 +00:00
(svn r17273) -Fix [Squirrel]: calling a function that has default parameters with not enough parameters can cause a crash
This commit is contained in:
parent
b841250913
commit
f9c18ccc48
4
src/3rdparty/squirrel/squirrel/sqvm.cpp
vendored
4
src/3rdparty/squirrel/squirrel/sqvm.cpp
vendored
@ -336,6 +336,10 @@ bool SQVM::StartCall(SQClosure *closure,SQInteger target,SQInteger args,SQIntege
|
|||||||
SQInteger ndef = func->_ndefaultparams;
|
SQInteger ndef = func->_ndefaultparams;
|
||||||
if(ndef && nargs < paramssize) {
|
if(ndef && nargs < paramssize) {
|
||||||
SQInteger diff = paramssize - nargs;
|
SQInteger diff = paramssize - nargs;
|
||||||
|
if (diff > ndef) {
|
||||||
|
Raise_Error(_SC("wrong number of parameters"));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
for(SQInteger n = ndef - diff; n < ndef; n++) {
|
for(SQInteger n = ndef - diff; n < ndef; n++) {
|
||||||
_stack._vals[stackbase + (nargs++)] = closure->_defaultparams[n];
|
_stack._vals[stackbase + (nargs++)] = closure->_defaultparams[n];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user