From 33c17dd10045a1b7d054e980b31c5859509d5846 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Fri, 17 Jun 2016 06:23:46 -0700
Subject: Tidy up some vector object initializations.

* lib.c (vector, copy_vec, sub_vec, cat_vec): Set the type
field of the object sooner. Do not malloc between obtaining
the object, and initializing it, because that could throw,
leaving an uninitialized object in the heap space.
---
 lib.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib.c')

diff --git a/lib.c b/lib.c
index 0b51c05f..9fcbe686 100644
--- a/lib.c
+++ b/lib.c
@@ -6017,12 +6017,12 @@ val vector(val length, val initval)
            : coerce(val *, uw_throwf(error_s, lit("vector: length ~a is too large"),
                                      length, nao));
   val vec = make_obj();
+  vec->v.type = VEC;
   initval = default_bool_arg(initval);
 #if HAVE_VALGRIND
   vec->v.vec_true_start = v;
 #endif
   v += 2;
-  vec->v.type = VEC;
   vec->v.vec = v;
   v[vec_alloc] = length;
   v[vec_length] = length;
@@ -6156,13 +6156,13 @@ val copy_vec(val vec_in)
 {
   val length = length_vec(vec_in);
   cnum alloc_plus = c_num(length) + 2;
-  val vec = make_obj();
   val *v = coerce(val *, chk_malloc(alloc_plus * sizeof *v));
+  val vec = make_obj();
+  vec->v.type = VEC;
 #if HAVE_VALGRIND
   vec->v.vec_true_start = v;
 #endif
   v += 2;
-  vec->v.type = VEC;
   vec->v.vec = v;
   v[vec_alloc] = length;
   v[vec_length] = length;
@@ -6197,13 +6197,13 @@ val sub_vec(val vec_in, val from, val to)
   } else {
     cnum cfrom = c_num(from);
     size_t nelem = c_num(to) - cfrom;
-    val vec = make_obj();
     val *v = coerce(val *, chk_malloc((nelem + 2) * sizeof *v));
+    val vec = make_obj();
+    vec->v.type = VEC;
 #if HAVE_VALGRIND
     vec->v.vec_true_start = v;
 #endif
     v += 2;
-    vec->v.type = VEC;
     vec->v.vec = v;
     v[vec_length] = v[vec_alloc] = num(nelem);
     memcpy(vec->v.vec, vec_in->v.vec + cfrom, nelem * sizeof *vec->v.vec);
@@ -6344,14 +6344,14 @@ val cat_vec(val list)
   if (total > (convert(size_t, -1)/(sizeof (val)) - 2))
     goto toobig;
 
-  vec = make_obj();
   v = coerce(val *, chk_malloc((total + 2) * sizeof *v));
+  vec = make_obj();
+  vec->v.type = VEC;
 
 #if HAVE_VALGRIND
   vec->v.vec_true_start = v;
 #endif
   v += 2;
-  vec->v.type = VEC;
   vec->v.vec = v;
   v[vec_length] = v[vec_alloc] = num(total);
 
-- 
cgit v1.2.3