From 58c4c8a32e8685262617ceb010bb5b184b3b6b6e Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Mon, 14 Oct 2019 13:49:41 -0400 Subject: [PATCH] Corrected problem in which using "ext2spice -d" (distributed junctions) causes magic to crash. --- ext2spice/ext2spice.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ext2spice/ext2spice.c b/ext2spice/ext2spice.c index 46853437..a5bc4817 100644 --- a/ext2spice/ext2spice.c +++ b/ext2spice/ext2spice.c @@ -2714,7 +2714,9 @@ FILE *outf; if ((nodeClient *)nn->efnn_node->efnode_client == (ClientData)NULL) initNodeClientHier(nn->efnn_node); - ((nodeClient *)nn->efnn_node->efnode_client)->m_w.visitMask |= DEV_CONNECT_MASK; + if (!esDistrJunct) + ((nodeClient *)nn->efnn_node->efnode_client)->m_w.visitMask |= + DEV_CONNECT_MASK; return nn->efnn_node; } } @@ -2919,8 +2921,11 @@ spcdevOutNode(prefix, suffix, name, outf) nn = (EFNodeName *) HashGetValue(he); nname = nodeSpiceName(nn->efnn_node->efnode_name->efnn_hier); fprintf(outf, " %s", nname); + /* Mark node as visited */ - ((nodeClient *)nn->efnn_node->efnode_client)->m_w.visitMask |= DEV_CONNECT_MASK; + if (!esDistrJunct) + ((nodeClient *)nn->efnn_node->efnode_client)->m_w.visitMask |= DEV_CONNECT_MASK; + return (1 + strlen(nname)); }