Combat spurious retention in args handling code.

* args.c (args_normalize): Zap the argument in the array
when moving it over to the list.

* args.h (args_atz): When zapping the argument in the list,
zap the actual car field, rather than the list itself. It seems there is a
copy of the list somewhere, so zapping it is not effective.

2 files changed, 6 insertions, 3 deletions

diff --git a/args.c b/args.c
index 7f65fc9e..c82d5f62 100644
--- a/args.c
+++ b/args.c
@@ -48,7 +48,7 @@ void args_normalize(struct args *args, cnum fill)
   bug_unless (fill <= args->argc);
 
   while (args->fill > fill)
-    args->list = cons(args->arg[--args->fill], args->list);
+    args->list = cons(z(args->arg[--args->fill]), args->list);
 
   while (args->fill < fill && args->list)
     args_add(args, pop(&args->list));
diff --git a/args.h b/args.h
index a0ea1743..23869d30 100644
--- a/args.h
+++ b/args.h
@@ -143,9 +143,12 @@ INLINE val args_at(struct args *args, cnum arg_index)
 
 INLINE val args_atz(struct args *args, cnum arg_index)
 {
-  if (arg_index < args->fill)
+  if (arg_index < args->fill) {
     return z(args->arg[arg_index]);
-  return car(z(args->list));
+  } else {
+    loc l = car_l(args->list);
+    return zap(valptr(l));
+  }
 }
 
 INLINE val args_get(struct args *args, cnum *arg_index)