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

CodeQL MemoryMayNotBeFreed.ql NMnetlist.c NMWriteNetlist() 

created use of 'alloc' local variable to track when an allocation occurred
so exit path logic is more straight forward for compiler/analyser to see
potential optimisations.

no attempt to free memory was made previously
This commit is contained in:
Darryl L. Miles 2025-02-13 08:38:56 +00:00 committed by Tim Edwards
parent 37fa75dd77
commit e565b4c360
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netmenu/NMnetlist.c
View File

@ -753,6 +753,7 @@ NMWriteNetlist(fileName)
FILE *file; FILE *file;
int nmWriteNetsFunc(); int nmWriteNetsFunc();
char *realName, line[50]; char *realName, line[50];
char *alloc = NULL;
if (nmCurrentNetlist == NULL) if (nmCurrentNetlist == NULL)
{ {
@ -768,7 +769,7 @@ NMWriteNetlist(fileName)
if (fileName == NULL) realName = nmCurrentNetlist->nl_fileName; if (fileName == NULL) realName = nmCurrentNetlist->nl_fileName;
else else
{ {
realName = mallocMagic((unsigned) (5 + strlen(fileName))); realName = alloc = mallocMagic((unsigned) (5 + strlen(fileName)));
(void) sprintf(realName, "%s.net", fileName); (void) sprintf(realName, "%s.net", fileName);
file = PaOpen(realName, "r", (char *) NULL, ".", file = PaOpen(realName, "r", (char *) NULL, ".",
(char *) NULL, (char **) NULL); (char *) NULL, (char **) NULL);
@ -777,8 +778,16 @@ NMWriteNetlist(fileName)
(void) fclose(file); (void) fclose(file);
TxPrintf("Net list file %s already exists.", realName); TxPrintf("Net list file %s already exists.", realName);
TxPrintf(" Should I overwrite it? [no] "); TxPrintf(" Should I overwrite it? [no] ");
if (TxGetLine(line, 50) == (char *) NULL) return; if (TxGetLine(line, sizeof(line)) == (char *) NULL)
if ((strcmp(line, "y") != 0) && (strcmp(line, "yes") != 0)) return; {
freeMagic(alloc);
return;
}
if ((strcmp(line, "y") != 0) && (strcmp(line, "yes") != 0))
{
freeMagic(alloc);
return;
}
} }
} }
@ -787,6 +796,7 @@ NMWriteNetlist(fileName)
if (file == NULL) if (file == NULL)
{ {
TxError("Couldn't write file %s.\n", realName); TxError("Couldn't write file %s.\n", realName);
if (alloc) freeMagic(alloc);
return; return;
} }
fprintf(file, " Netlist File\n"); fprintf(file, " Netlist File\n");
@ -794,6 +804,7 @@ NMWriteNetlist(fileName)
if (strcmp(realName, nmCurrentNetlist->nl_fileName) == 0) if (strcmp(realName, nmCurrentNetlist->nl_fileName) == 0)
nmCurrentNetlist->nl_flags &= ~NL_MODIFIED; nmCurrentNetlist->nl_flags &= ~NL_MODIFIED;
(void) fclose(file); (void) fclose(file);
if (alloc) freeMagic(alloc);
} }
int int