uefi-ref/nasm
1
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm synced 2026-08-26 16:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

asm: nasmlib: remove excess checks before free()

Browse source 
More info: https://stackoverflow.com/questions/13818803/check-for-null-before-delete-in-c-good-practice

In C this became possible after C89, code is cleaner.

```
 C89: 4.10.3.2 The free function.

The free function causes the space pointed to by ptr to be deallocated, that is, made available for further allocation. If ptr is a null pointer, no action occurs.
```
This commit is contained in:
Herman Semenoff 2026-07-31 16:29:51 +03:00
parent b2734a91bd
commit e96da30ac7
6 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
asm/assemble.c
View file

@ -1016,8 +1016,7 @@ static int64_t assemble(insn *instruction)
" reading file `%s'", fname);
}
close_done:
if (buf)
nasm_free(buf);
nasm_free(buf);
if (map)
nasm_unmap_file(map, len);
fclose(fp);

6
asm/labels.c
View file

@ -210,8 +210,7 @@ static union label *find_label(const char *label, bool create, bool *created)
if (lptr || !create) {
if (created)
*created = false;
if (label_str)
nasm_free(label_str);
nasm_free(label_str);
return lptr;
}
@ -232,8 +231,7 @@ static union label *find_label(const char *label, bool create, bool *created)
nasm_zero(*lfree);
lfree->defn.label = perm_copy(label);
lfree->defn.subsection = NO_SEG;
if (label_str)
nasm_free(label_str);
nasm_free(label_str);
hash_add(&ip, lfree->defn.label, lfree);
return lfree++;

3
asm/parser.c
View file

@ -618,8 +618,7 @@ static int parse_eops(extop **result, bool critical, int elem)
return oper_num;
fail:
if (eop)
nasm_free(eop);
nasm_free(eop);
return -1;
}

1
asm/preproc.c
View file

@ -950,7 +950,6 @@ static const char *pp_getenv(const Token *t, bool warn)
v = "";
}
if (buf)
nasm_free(buf);
return v;

6
nasmlib/alloc.c
View file

@ -74,8 +74,7 @@ void *nasm_realloc(void *q, size_t size)
void nasm_free(void *q)
{
if (q)
free(q);
free(q);
}
char *nasm_strdup(const char *s)
@ -103,8 +102,7 @@ char *nasm_strdupto(char **ptrp, const char *str)
{
char *ptr = *ptrp;
if (str) {
if (ptr)
nasm_free(ptr);
nasm_free(ptr);
*ptrp = ptr = nasm_strdup(str);
}
return ptr;

3
nasmlib/hashtbl.c
View file

@ -251,8 +251,7 @@ void hash_free_all(struct hash_table *head, bool free_keys)
const struct hash_node *np;
hash_for_each(head, it, np) {
if (np->data)
nasm_free(np->data);
nasm_free(np->data);
if (free_keys && np->key)
nasm_free((void *)np->key);
}