mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17273) -Fix [Squirrel]: calling a function that has default parameters with not enough parameters can cause a crash

release/1.0
yexo 2009-08-23 19:25:52 +00:00
parent b841250913
commit f9c18ccc48
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/squirrel/squirrel/sqvm.cpp vendored
View File

@ -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];
} }