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

check for circular lists in apply (issue #629)

Browse source
This commit is contained in:
Alex Shinn 2020-05-03 17:19:06 +09:00
parent 156ddf793d
commit 696bf30f5e
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
vm.c
View file

@ -1001,7 +1001,7 @@ int sexp_poll_port(sexp ctx, sexp port, int inputp) {
sexp sexp_apply (sexp ctx, sexp proc, sexp args) { sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
unsigned char *ip; unsigned char *ip;
sexp bc, cp, *stack = sexp_stack_data(sexp_context_stack(ctx)); sexp bc, cp, *stack = sexp_stack_data(sexp_context_stack(ctx)), tmp;
sexp_sint_t i, j, k, fp, top = sexp_stack_top(sexp_context_stack(ctx)); sexp_sint_t i, j, k, fp, top = sexp_stack_top(sexp_context_stack(ctx));
#if SEXP_USE_GREEN_THREADS #if SEXP_USE_GREEN_THREADS
sexp root_thread = ctx; sexp root_thread = ctx;
@ -1170,7 +1170,10 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
tmp1 = _ARG1; tmp1 = _ARG1;
tmp2 = _ARG2; tmp2 = _ARG2;
apply1: apply1:
i = sexp_unbox_fixnum(sexp_length(ctx, tmp2)); /* number of params */ tmp = sexp_length(ctx, tmp2);
if (sexp_not(tmp))
sexp_raise("apply: circular list", sexp_list1(ctx, tmp2));
i = sexp_unbox_fixnum(tmp); /* number of params */
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));
k = sexp_unbox_fixnum(stack[fp+3]); /* previous fp */ k = sexp_unbox_fixnum(stack[fp+3]); /* previous fp */
j = sexp_unbox_fixnum(stack[fp]); /* previous num params */ j = sexp_unbox_fixnum(stack[fp]); /* previous num params */