Skip to content

fix for crash for functions with > 127 local vars #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
virt00l wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix for crash for functions with > 127 local vars #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion squirrel/sqcompiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,10 @@ class SQCompiler
for(SQInteger i = 0; i < (nargs - 1); i++) _fs->PopTarget();
SQInteger stackbase = _fs->PopTarget();
SQInteger closure = _fs->PopTarget();
_fs->AddInstruction(_OP_CALL, _fs->PushTarget(), closure, stackbase, nargs);
SQInteger target = _fs->PushTarget();
assert(target >= -1);
assert(target < 255);
_fs->AddInstruction(_OP_CALL, target, closure, stackbase, nargs);
}
void ParseTableOrClass(SQInteger separator,SQInteger terminator)
{
Expand Down
19 changes: 10 additions & 9 deletions squirrel/sqvm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,32 +738,33 @@ bool SQVM::Execute(SQObjectPtr &closure, SQInteger nargs, SQInteger stackbase,SQ
}
case _OP_CALL: {
SQObjectPtr clo = STK(arg1);
int tgt0 = arg0 == 255 ? -1 : arg0;
switch (sq_type(clo)) {
case OT_CLOSURE:
_GUARD(StartCall(_closure(clo), sarg0, arg3, _stackbase+arg2, false));
_GUARD(StartCall(_closure(clo), tgt0, arg3, _stackbase+arg2, false));
continue;
case OT_NATIVECLOSURE: {
bool suspend;
bool tailcall;
_GUARD(CallNative(_nativeclosure(clo), arg3, _stackbase+arg2, clo, (SQInt32)sarg0, suspend, tailcall));
_GUARD(CallNative(_nativeclosure(clo), arg3, _stackbase+arg2, clo, tgt0, suspend, tailcall));
if(suspend){
_suspended = SQTrue;
_suspended_target = sarg0;
_suspended_target = tgt0;
_suspended_root = ci->_root;
_suspended_traps = traps;
outres = clo;
return true;
}
if(sarg0 != -1 && !tailcall) {
STK(arg0) = clo;
if(tgt0 != -1 && !tailcall) {
STK(tgt0) = clo;
}
}
continue;
case OT_CLASS:{
SQObjectPtr inst;
_GUARD(CreateClassInstance(_class(clo),inst,clo));
if(sarg0 != -1) {
STK(arg0) = inst;
if(tgt0 != -1) {
STK(tgt0) = inst;
}
SQInteger stkbase;
switch(sq_type(clo)) {
Expand All @@ -790,8 +791,8 @@ bool SQVM::Execute(SQObjectPtr &closure, SQInteger nargs, SQInteger stackbase,SQ
Push(clo);
for (SQInteger i = 0; i < arg3; i++) Push(STK(arg2 + i));
if(!CallMetaMethod(closure, MT_CALL, arg3+1, clo)) SQ_THROW();
if(sarg0 != -1) {
STK(arg0) = clo;
if(tgt0 != -1) {
STK(tgt0) = clo;
}
break;
}
Expand Down