From 1471f0c09f6de82d4edaec218727bec7787ffede Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Fri, 5 May 2017 17:35:57 -0400
Subject: [PATCH] Corrected error in combining property records of serial
 devices.

---
 base/netgen.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/base/netgen.c b/base/netgen.c
index 215829c..6e5085b 100644
--- a/base/netgen.c
+++ b/base/netgen.c
@@ -3463,7 +3463,8 @@ int CombineSerial(char *model, int file)
 
 	    /* Excise the 2nd instance.  instlist[i][1] remains as the	*/
 	    /* only pointer to it.					*/
-            for (obp = instlist[i][0]; obp->next->type != FIRSTPIN; obp = obp->next);
+            for (obp = instlist[i][0]; obp->next->type > FIRSTPIN ||
+			obp->next->type == PROPERTY; obp = obp->next);
             for (ob2 = obp; ob2->next != instlist[i][1]; ob2 = ob2->next);
 	    for (obs = ob2->next; obs->next && obs->next->type != FIRSTPIN;
 			obs = obs->next);