From 983c6540863baab71be11db6c3d8923764abd876 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Thu, 5 Mar 2020 15:20:46 -0500
Subject: [PATCH] Corrected error in property matching that can cause a
 segfault.

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

diff --git a/base/netcmp.c b/base/netcmp.c
index 34c43f9..9553432 100644
--- a/base/netcmp.c
+++ b/base/netcmp.c
@@ -4436,12 +4436,13 @@ int PropertyOptimize(struct objlist *ob, struct nlist *tp, int run, int series,
 		  if (vl == NULL) {
 		     if (kl->type != vlist[p][j]->type)
 			PromoteProperty(kl, vl2);
+		     vl = &dfltvl;
 		  }
 		  else {
 		     if (kl->type != vlist[p][i]->type)
 			PromoteProperty(kl, vl);
+		     vl2 = &dfltvl;
 		  }
-		  vl = &dfltvl;
 		  dfltvl.type = kl->type;
 		  switch (kl->type) {
 		     case PROP_STRING: