Skip to content

Commit 407868d

Browse files
committed
kconfig: remove redundant NULL pointer check before free()
Passing NULL to free() is allowed and is a no-op. Remove redundant NULL pointer checks. Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 9ad86d7 commit 407868d

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

scripts/kconfig/confdata.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,7 @@ int conf_read_simple(const char *name, int def)
432432
case S_INT:
433433
case S_HEX:
434434
case S_STRING:
435-
if (sym->def[def].val)
436-
free(sym->def[def].val);
435+
free(sym->def[def].val);
437436
/* fall through */
438437
default:
439438
sym->def[def].val = NULL;

scripts/kconfig/util.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ struct gstr str_new(void)
4242
/* Free storage for growable string */
4343
void str_free(struct gstr *gs)
4444
{
45-
if (gs->s)
46-
free(gs->s);
45+
free(gs->s);
4746
gs->s = NULL;
4847
gs->len = 0;
4948
}

0 commit comments

Comments
 (0)