From 2a6212f77ec9ffbc273dce1f9d7378da6dfed288 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Sun, 11 Nov 2018 17:57:13 +0100
Subject: [PATCH] Add a function gc_start to reset the garbage collector

---
 src/xspice/mif/mif_inp2.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/xspice/mif/mif_inp2.c b/src/xspice/mif/mif_inp2.c
index 86d24b6fa..f2dc359f5 100644
--- a/src/xspice/mif/mif_inp2.c
+++ b/src/xspice/mif/mif_inp2.c
@@ -101,6 +101,7 @@ Some tokens should not be deleted here, they need another copying.
 static char *MIFgettok_gc(char **line);
 static char *MIFget_token_gc(char **s, Mif_Token_Type_t *type);
 static char *copy_gc(char *in);
+static void gc_start(void);
 static void gc_end(void);
 
 #define MIFgettok MIFgettok_gc
@@ -202,6 +203,8 @@ MIF_INP2A (
     /* get the line text from the card struct */
     line = current->line;
 
+    /* reset the garbage collector */
+    gc_start();
 
     /* get the name of the instance and add it to the symbol table */
     name = copy(MIFgettok(&line));
@@ -400,6 +403,7 @@ MIF_INP2A (
             if(next_token_type != MIF_LARRAY_TOK) {
                 LITERR("Missing [, an array connection was expected");
                 printf("Missing [, an array connection was expected.  Returning . . .");
+                gc_end();
                 return;
             } else /* eat the [  */
                 next_token = MIFget_token(&line,&next_token_type);
@@ -1030,13 +1034,22 @@ char *MIFget_token_gc(char **s, Mif_Token_Type_t *type)
     return newtok;
 }
 
+static
+void gc_start(void)
+{
+    int i;
+    for (i = 0; i < BSIZE_SP; i++)
+        alltokens[i] = NULL;
+    curtoknr = 0;
+}
+
 static
 void gc_end(void)
 {
     int i, j;
     for (i = 0; i < BSIZE_SP; i++) {
         /* We have multiple entries with the same address */
-        for (j = i + 1; j < BSIZE_SP; j++)
+        for (j = i + 1; j < curtoknr; j++)
             if (alltokens[i] == alltokens[j])
                 alltokens[j] = NULL;
         tfree(alltokens[i]);