From 29f5d62f0af2896df026d1c221f374fcb047054f Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Thu, 22 Nov 2001 20:25:09 +0000
Subject: [PATCH] Added patches to fix inital segfault.

---
 src/frontend/inp.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/frontend/inp.c b/src/frontend/inp.c
index c73b98f92..4bc76a8d9 100644
--- a/src/frontend/inp.c
+++ b/src/frontend/inp.c
@@ -438,8 +438,17 @@ inp_spsource(FILE *fp, bool comfile, char *filename)
              * the case before we do this but after we deal with the
              * commands.  */
             if (!cp_getvar("nosubckt", VT_BOOL, (char *) &nosubckts))
+<<<<<<< inp.c
+                if((deck->li_next = inp_subcktexpand(deck->li_next)) == NULL){
+					line_free(realdeck,TRUE);
+					line_free(deck->li_actual, TRUE);
+			return;
+		}
+	    line_free(deck->li_actual,FALSE); /* SJB - free memory used by old li_actual (if any) */
+=======
                 deck->li_next = inp_subcktexpand(deck->li_next);
 	    line_free(deck->li_actual,FALSE); /* SJB - free memory used by old li_actual (if any) */
+>>>>>>> 1.7
             deck->li_actual = realdeck;
             inp_dodeck(deck, tt, wl_first, FALSE, options, filename);
         }