From 2b7b12d34c5c2d57e7f8c216a9e86090f1ea6979 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Thu, 16 Jun 2022 19:54:21 -0400
Subject: [PATCH] Added a catch for a node named "(none)" in a merge line. 
 This prevents magic from crashing but does not do anything about the fact
 that a non-existent node ended up in the .ext file, which will have to be
 investigated.

---
 VERSION              |  2 +-
 ext2spice/ext2hier.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/VERSION b/VERSION
index c6bbf590..e14e457c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.312
+8.3.313
diff --git a/ext2spice/ext2hier.c b/ext2spice/ext2hier.c
index 863d95cf..eb62f0fd 100644
--- a/ext2spice/ext2hier.c
+++ b/ext2spice/ext2hier.c
@@ -1782,11 +1782,18 @@ esMakePorts(hc, cdata)
 		if (he != NULL)
 		{
 		    nn = (EFNodeName *) HashGetValue(he);
-		    flagrec->fdr_node = nn->efnn_node;
-		    flagrec->fdr_node->efnode_flags |= flagrec->fdr_flags;
+		    if (nn == NULL)
+		    {
+			TxError("Error:  Node %s not found in cell %s!\n",
+				locname, def->def_name);
+		    }
+		    else
+		    {
+		    	flagrec->fdr_node = nn->efnn_node;
+		    	flagrec->fdr_node->efnode_flags |= flagrec->fdr_flags;
+		    }
 		}
 	    }
-
 	}
     }