Labelling: Some fixes concerning variants initialization

diff --git a/labeller.c b/labeller.c
index ed04defff0ece8e920b0aa696c033714b0694ec5..84811ab630892958a9fb3363956d652ee1394216 100644 (file)
--- a/labeller.c
+++ b/labeller.c
@@ -696,6 +696,7 @@ struct request_line *make_new_line(void)
   rl->request.ind = num_requests++;
   rl->request.type = REQUEST_LINE;
   GARY_INIT(rl->sections, 0);
+  GARY_INIT(rl->request.variants, 0);
 
   return rl;
 }
@@ -707,6 +708,7 @@ struct request_section *make_new_section(struct request_line *rl)
   rls->request.type = REQUEST_SECTION;
   rls->num_segments = 0;
   GARY_INIT(rls->segments, 0);
+  GARY_INIT(rls->request.variants, 0);
 
   return rls;
 }
@@ -719,9 +721,9 @@ struct request_segment *make_new_segment(struct request_section *rls, struct sym
   rs->request.ind = num_requests++;
   rs->request.type = REQUEST_SEGMENT;
 
-  struct variant *v = malloc(sizeof(struct variant));
+  GARY_INIT(rs->request.variants, 0);
+  struct variant *v = GARY_PUSH(rs->request.variants);
   make_bitmap(v, sym);
-  rs->request.variants = v;
 
   return rs;
 }