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

Corrected an error in the GDS read routine which attempts to kill 

a hash table that was never initialized, if the GDS file input
reader encounters an error in the GDS data.
This commit is contained in:
Tim Edwards 2019-05-22 14:24:44 -04:00
parent 24786b208a
commit ec8ffe7333
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calma/CalmaRdcl.c
View File

@ -288,6 +288,7 @@ calmaParseStructure(filename)
int mfactor; int mfactor;
off_t filepos; off_t filepos;
bool was_called; bool was_called;
bool was_initialized;
CellDef *def; CellDef *def;
/* Make sure this is a structure; if not, let the caller know we're done */ /* Make sure this is a structure; if not, let the caller know we're done */
@ -296,7 +297,8 @@ calmaParseStructure(filename)
return (FALSE); return (FALSE);
/* Read the structure name */ /* Read the structure name */
if (!calmaSkipExact(CALMA_BGNSTR)) goto syntaxerror;; was_initialized = FALSE;
if (!calmaSkipExact(CALMA_BGNSTR)) goto syntaxerror;
if (!calmaReadStringRecord(CALMA_STRNAME, &strname)) goto syntaxerror; if (!calmaReadStringRecord(CALMA_STRNAME, &strname)) goto syntaxerror;
TxPrintf("Reading \"%s\".\n", strname); TxPrintf("Reading \"%s\".\n", strname);
@ -354,6 +356,7 @@ calmaParseStructure(filename)
/* Initialize the hash table for layer errors */ /* Initialize the hash table for layer errors */
HashInit(&calmaLayerHash, 32, sizeof (CalmaLayerType) / sizeof (unsigned)); HashInit(&calmaLayerHash, 32, sizeof (CalmaLayerType) / sizeof (unsigned));
was_initialized = TRUE;
/* Body of structure: a sequence of elements */ /* Body of structure: a sequence of elements */
osrefs = nsrefs = 0; osrefs = nsrefs = 0;
@ -466,7 +469,7 @@ done:
/* Syntax error: skip to CALMA_ENDSTR */ /* Syntax error: skip to CALMA_ENDSTR */
syntaxerror: syntaxerror:
HashKill(&calmaLayerHash); if (was_initialized == TRUE) HashKill(&calmaLayerHash);
return (calmaSkipTo(CALMA_ENDSTR)); return (calmaSkipTo(CALMA_ENDSTR));
} }