diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2020-08-17 10:08:35 +0200 |
|---|---|---|
| committer | Antonio Borneo <borneo.antonio@gmail.com> | 2020-09-05 17:11:34 +0100 |
| commit | 62329444abc89ad3b37fbb4ebc2edfd1dee23351 (patch) | |
| tree | a5d83cee6878aa9e055ddc2e718c46b9c9e8b89b /src/flash/nand | |
| parent | 47d29ebe11babdddd107ba5edab7e5cd85ce1fee (diff) | |
| download | riscv-openocd-62329444abc89ad3b37fbb4ebc2edfd1dee23351.zip riscv-openocd-62329444abc89ad3b37fbb4ebc2edfd1dee23351.tar.gz riscv-openocd-62329444abc89ad3b37fbb4ebc2edfd1dee23351.tar.bz2 | |
flash: avoid checking for non NULL pointer to free it
The function free() can be called with a NULL pointer as argument,
no need to check the argument before. If the pointer is NULL, no
operation is performed by free().
Remove the occurrences of pattern:
if (ptr)
free(ptr);
There are cases where the pointer is set to NULL after free(), but
then re-assigned within few lines. Drop the setting to NULL when
this is evident. Anyway, the compiler will remove the useless
assignment so no reason to be too much aggressive in this change.
Change-Id: I55b2ce7cbe201410016398933e34d33a4b66e30b
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5811
Tested-by: jenkins
Diffstat (limited to 'src/flash/nand')
| -rw-r--r-- | src/flash/nand/fileio.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c index 1279e45..fee4012 100644 --- a/src/flash/nand/fileio.c +++ b/src/flash/nand/fileio.c @@ -99,14 +99,11 @@ int nand_fileio_cleanup(struct nand_fileio_state *state) if (state->file_opened) fileio_close(state->fileio); - if (state->oob) { - free(state->oob); - state->oob = NULL; - } - if (state->page) { - free(state->page); - state->page = NULL; - } + free(state->oob); + state->oob = NULL; + + free(state->page); + state->page = NULL; return ERROR_OK; } int nand_fileio_finish(struct nand_fileio_state *state) |