OctaForge
/
libcubescript
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

fix doargs segv

master
Daniel Kolesa 2016-09-15 04:30:37 +02:00
parent 38c17d1911
commit c97e56d7b7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cs_vm.hh
View File

@ -352,11 +352,15 @@ static void cs_do_args(CsState &cs, F body) {
}
CsIdentLink *prevstack = cs.p_callstack->next;
CsIdentLink aliaslink = {
cs.p_callstack->id, cs.p_callstack, prevstack->usedargs, prevstack->argstack
cs.p_callstack->id, cs.p_callstack,
prevstack ? prevstack->usedargs : ((1 << MaxArguments) - 1),
prevstack ? prevstack->argstack : nullptr
};
cs.p_callstack = &aliaslink;
cs_do_and_cleanup(ostd::move(body), [&]() {
prevstack->usedargs = aliaslink.usedargs;
if (prevstack) {
prevstack->usedargs = aliaslink.usedargs;
}
cs.p_callstack = aliaslink.next;
int argmask2 = cs.p_callstack->usedargs;
for (int i = 0; argmask2; argmask2 >>= 1, ++i) {