luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apparently forgot to push the last set of changed. Fixes a null 

return value in EFbuild.c and adds a couple of sanity checks.
This commit is contained in:
Tim Edwards 2023-05-18 09:25:37 -04:00
parent 44b269e037
commit c514f5ce0b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.398 8.3.399

5
calma/CalmaRdcl.c
View File

@ -1374,7 +1374,8 @@ calmaFindCell(name, was_called, predefined)
* if the cell is used in a parent before being defined * if the cell is used in a parent before being defined
* then it will cause a core dump. * then it will cause a core dump.
*/ */
DBReComputeBbox(def); DBReComputeBbox(def);
if (was_called) *was_called = FALSE;
} }
else else
{ {
@ -1385,9 +1386,9 @@ calmaFindCell(name, was_called, predefined)
if (predefined) *predefined = TRUE; if (predefined) *predefined = TRUE;
TxPrintf("Using pre-existing cell definition\n"); TxPrintf("Using pre-existing cell definition\n");
} }
if (was_called) *was_called = TRUE;
} }
HashSetValue(h, def); HashSetValue(h, def);
if (was_called) *was_called = FALSE;
} }
else else
{ {

2
extflat/EFbuild.c
View File

@ -1789,7 +1789,7 @@ efNodeMerge(node1ptr, node2ptr)
/* Sanity check: ignore if same node */ /* Sanity check: ignore if same node */
if (*node1ptr == *node2ptr) if (*node1ptr == *node2ptr)
return; return NULL;
/* Keep the node with the greater number of entries, and merge */ /* Keep the node with the greater number of entries, and merge */
/* the node with fewer entries into it. */ /* the node with fewer entries into it. */