From ce496a342712083526d424d965a6fa689b6b09cb Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Mon, 25 Aug 2014 19:40:46 -0700
Subject: GC correctness fixes: make sure we pin down objects for which we
 borrow low level C pointers, while we execute code that can cons memory.

* lib.c (list_str): Protect the str argument.
(int_str): Likewise.

* regex.c (search_regex): protect the haystack string,
while using the h pointer to its data, since regex_run
can use the derivative-based engine which conses.

* stream.c (vformat_str): Protect str argument, since
put_char might conceivably cons.
(vformat): Protect fmtstr.
---
 stream.c | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

(limited to 'stream.c')

diff --git a/stream.c b/stream.c
index 2aa5160b..a02fb213 100644
--- a/stream.c
+++ b/stream.c
@@ -1477,21 +1477,28 @@ static val vformat_str(val stream, val str, int width, int left,
   int slack = (truelen < width) ? width - truelen : 0;
   int i;
 
+  prot1(&str);
+
   if (!left)
     for (i = 0; i < slack; i++)
       if (!put_char(chr(' '), stream))
-        return nil;
+        goto nilout;
 
   for (i = 0; i < truelen; i++)
     if (!put_char(chr(cstr[i]), stream))
-      return nil;
+      goto nilout;
 
   if (left)
     for (i = 0; i < slack; i++)
       if (!put_char(chr(' '), stream))
-        return nil;
+        goto nilout;
 
+  rel1(&str);
   return t;
+
+nilout:
+  rel1(&str);
+  return nil;
 }
 
 val vformat(val stream, val fmtstr, va_list vl)
@@ -1500,6 +1507,8 @@ val vformat(val stream, val fmtstr, va_list vl)
   type_assert (stream->co.cls == stream_s, (lit("~a is not a stream"),
                                             stream, nao));
 
+  prot1(&fmtstr);
+
   {
     const wchar_t *fmt = c_str(fmtstr);
     enum {
@@ -1725,7 +1734,7 @@ val vformat(val stream, val fmtstr, va_list vl)
             if (!isdigit(num_buf[0]) && !isdigit(num_buf[1])) {
               if (!vformat_str(stream, lit("#<bad-float>"),
                                width, left, 0))
-                return nil;
+                goto nilout;
               continue;
             }
             precision = 0;
@@ -1786,7 +1795,7 @@ val vformat(val stream, val fmtstr, va_list vl)
             if (!isdigit(num_buf[0]) && !isdigit(num_buf[1])) {
               if (!vformat_str(stream, lit("#<bad-float>"),
                                width, left, 0))
-                return nil;
+                goto nilout;
               continue;
             }
 
@@ -1797,7 +1806,7 @@ val vformat(val stream, val fmtstr, va_list vl)
               val str = format(nil, ch == 'a' ? lit("~a") : lit("~s"),
                                obj, nao);
               if (!vformat_str(stream, str, width, left, precision))
-                return nil;
+                goto nilout;
               continue;
             }
           }
@@ -1821,7 +1830,7 @@ val vformat(val stream, val fmtstr, va_list vl)
             if (pnum != num_buf)
               free(pnum);
             if (!res)
-              return nil;
+              goto nilout;
             continue;
           }
         }
@@ -1834,7 +1843,13 @@ val vformat(val stream, val fmtstr, va_list vl)
 
   if (va_arg(vl, val) != nao)
     internal_error("unterminated format argument list");
+
+  rel1(&fmtstr);
   return t;
+
+nilout:
+  rel1(&fmtstr);
+  return nil;
 premature:
   internal_error("insufficient arguments for format");
 toobig:
@@ -2374,6 +2389,8 @@ static val run(val command, val args)
   args = default_bool_arg(args);
   nargs = c_num(length(args)) + 1;
 
+  prot1(&args);
+
   wargv = (const wchar_t **) chk_malloc((nargs + 2) * sizeof *wargv);
 
   for (i = 0, iter = cons(command, args); iter; i++, iter = cdr(iter))
@@ -2386,6 +2403,8 @@ static val run(val command, val args)
     free((void *) wargv[i]);
   free((void *) wargv);
 
+  rel1(&args);
+
   return (status < 0) ? nil : num(status);
 }
 #else
-- 
cgit v1.2.3