mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2024-12-03 08:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

preproc: nasm_free is safe against NULL argument

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2011-06-28 01:33:02 +04:00
parent c6a742cb6b
commit b6c6ca96e7
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
preproc.c
View File

@ -703,10 +703,8 @@ static void free_expdef(ExpDef * ed)
*/ */
static void free_expinv(ExpInv * ei) static void free_expinv(ExpInv * ei)
{ {
if (ei->name != NULL) nasm_free(ei->name);
nasm_free(ei->name); nasm_free(ei->label_text);
if (ei->label_text != NULL)
nasm_free(ei->label_text);
nasm_free(ei); nasm_free(ei);
} }
@ -1268,8 +1266,7 @@ static void delete_Blocks(void)
* free it. * free it.
*/ */
while (b) { while (b) {
if (b->chunk) nasm_free(b->chunk);
nasm_free(b->chunk);
a = b; a = b;
b = b->next; b = b->next;
if (a != &blocks) if (a != &blocks)
@ -3485,8 +3482,7 @@ issue_error:
macro_start = nasm_zalloc(sizeof(*macro_start)); macro_start = nasm_zalloc(sizeof(*macro_start));
macro_start->text = nasm_quote(p, strlen(p)); macro_start->text = nasm_quote(p, strlen(p));
macro_start->type = TOK_STRING; macro_start->type = TOK_STRING;
if (xsl) nasm_free(xsl);
nasm_free(xsl);
/* /*
* We now have a macro name, an implicit parameter count of * We now have a macro name, an implicit parameter count of
@ -5395,8 +5391,7 @@ static void pp_cleanup(int pass)
delete_Blocks(); delete_Blocks();
while ((i = ipath)) { while ((i = ipath)) {
ipath = i->next; ipath = i->next;
if (i->path) nasm_free(i->path);
nasm_free(i->path);
nasm_free(i); nasm_free(i);
} }
} }