From 6b934a94886f0cf48325b9fa84172bde09429967 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Fri, 12 Jul 2019 00:05:47 -0400 Subject: [PATCH] Do not check `NULL` to call free(): free() accepts `NULL` Semantic patch: @@ expression e; @@ - if (e) { free(e); } + free(e); @@ expression e; @@ - if (e != NULL) { free(e); } + free(e); Signed-off-by: Francis Deslauriers Change-Id: I4d2d79a8beda4ca1ec7bacd5424c3c8e19d158f0 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1698 CI-Build: Philippe Proulx Tested-by: jenkins Reviewed-by: Philippe Proulx --- src/common/common.c | 4 +--- src/plugins/ctf/common/metadata/decoder.c | 4 +--- src/plugins/ctf/fs-src/metadata.c | 4 +--- tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/common/common.c b/src/common/common.c index beedec66..d092768a 100644 --- a/src/common/common.c +++ b/src/common/common.c @@ -1115,9 +1115,7 @@ error: norm_path = NULL; } end: - if (tmp) { - free(tmp); - } + free(tmp); return norm_path; } #else diff --git a/src/plugins/ctf/common/metadata/decoder.c b/src/plugins/ctf/common/metadata/decoder.c index 6215403c..4f4092de 100644 --- a/src/plugins/ctf/common/metadata/decoder.c +++ b/src/plugins/ctf/common/metadata/decoder.c @@ -290,9 +290,7 @@ end: } } - if (buf) { - free(buf); - } + free(buf); return status; } diff --git a/src/plugins/ctf/fs-src/metadata.c b/src/plugins/ctf/fs-src/metadata.c index 63b7f0ed..8a1d9828 100644 --- a/src/plugins/ctf/fs-src/metadata.c +++ b/src/plugins/ctf/fs-src/metadata.c @@ -151,9 +151,7 @@ int ctf_fs_metadata_init(struct ctf_fs_metadata *metadata) BT_HIDDEN void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata) { - if (metadata->text) { - free(metadata->text); - } + free(metadata->text); if (metadata->trace_class) { BT_TRACE_CLASS_PUT_REF_AND_RESET(metadata->trace_class); diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c index 38848f21..6d293224 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c @@ -167,9 +167,7 @@ void subtest_lookup_function_name(struct bin_info *bin, uint64_t addr, ret = bin_info_lookup_function_name(bin, SO_INV_ADDR, &_func_name); ok(ret == -1 && _func_name == NULL, "bin_info_lookup_function_name - fail on invalid addr"); - if (_func_name) { - free(_func_name); - } + free(_func_name); } static -- 2.34.1