Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 05:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #954 from petteripiiroinen/fix-unintialised-stack-top-issue

Browse source 
Fix: segmentation fault during GC marking
This commit is contained in:
Alex Shinn 2024-05-19 22:08:38 +09:00 • committed by GitHub
commit 86ef8f5f1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vm.c
View file

@ -1095,7 +1095,9 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
sexp_ensure_stack(i + 64 + (sexp_procedurep(tmp1) ? sexp_bytecode_max_depth(sexp_procedure_code(tmp1)) : 0)); sexp_ensure_stack(i + 64 + (sexp_procedurep(tmp1) ? sexp_bytecode_max_depth(sexp_procedure_code(tmp1)) : 0));
for (top += i; sexp_pairp(tmp2); tmp2=sexp_cdr(tmp2), top--) for (top += i; sexp_pairp(tmp2); tmp2=sexp_cdr(tmp2), top--)
_ARG1 = sexp_car(tmp2); _ARG1 = sexp_car(tmp2);
top += i+1; top += i;
/* restore the make_call invariant */
_PUSH(tmp1);
goto make_call; goto make_call;
loop: loop:
@ -1266,7 +1268,9 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
int prev_top = top; int prev_top = top;
for (top=fp-j+i-1; sexp_pairp(tmp2); tmp2=sexp_cdr(tmp2), top--) for (top=fp-j+i-1; sexp_pairp(tmp2); tmp2=sexp_cdr(tmp2), top--)
stack[top] = sexp_car(tmp2); stack[top] = sexp_car(tmp2);
top = fp+i-j+1; top = fp+i-j;
/* restore the make_call invariant */
_PUSH(tmp1);
fp = k; fp = k;
/* if final cdr of tmp2 isn't null, then args list was improper */ /* if final cdr of tmp2 isn't null, then args list was improper */
if (! sexp_nullp(tmp2)) { if (! sexp_nullp(tmp2)) {
@ -1289,7 +1293,9 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
/* copy new args into place */ /* copy new args into place */
for (k=0; k<i; k++) for (k=0; k<i; k++)
stack[fp-j+k] = stack[top-1-i+k]; stack[fp-j+k] = stack[top-1-i+k];
top = fp+i-j+1; top = fp+i-j;
/* restore the make_call invariant */
_PUSH(tmp1);
fp = sexp_unbox_fixnum(tmp2); fp = sexp_unbox_fixnum(tmp2);
goto make_call; goto make_call;
case SEXP_OP_CALL: case SEXP_OP_CALL: