luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-09-03 04:33:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Corrected two potentially fatal errors: (1) Code doing the PDK_PATH

Browse Source 
and HOME substitution in filenames needs to watch for a NULL
cd_file, and (2) The routine that removes the (UNNAMED) cell when
another cell is loaded needs to NULL the boxRootDef pointer or else
it ends up pointing to deallocated memory.
This commit is contained in:
Tim Edwards
2021-04-24 22:13:30 -04:00
parent 56c0620417
commit 0dcc9c6ca7
5 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/DBcellname.c
+1 -2
View File
@@ -273,6 +273,7 @@ DBCellDelete(cellname, force)
}
celldef->cd_parents = (CellUse *)NULL;
DBWResetBox(celldef);
result = DBCellDeleteDef(celldef);
if (result == FALSE)
@@ -282,8 +283,6 @@ DBCellDelete(cellname, force)
return result;
}
/*
* ----------------------------------------------------------------------------
*
database/DBio.c
+3 -1
View File
@@ -3494,7 +3494,9 @@ DBPathSubstitute(pathstart, cstring, cellDef)
char *homedir = getenv("HOME");
if (!strncmp(cellDef->cd_file, homedir, strlen(homedir))
if (cellDef->cd_file == NULL)
sprintf(cstring, "%s", pathstart);
else if (!strncmp(cellDef->cd_file, homedir, strlen(homedir))
&& (*(cellDef->cd_file + strlen(homedir)) == '/'))
sprintf(cstring, "~%s", cellDef->cd_file + strlen(homedir));
else