diff options
author | Thomas Jarosch <thomas.jarosch@intra2net.com> | 2013-01-28 04:21:14 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-01-30 08:40:44 -0500 |
commit | 5809fde040de2afa477a6c593ce2e8fd2c11d9d3 (patch) | |
tree | b6ff202ebeca4341a1332258a04403f8ce95e75a /tools/perf/util | |
parent | fdae6373910c10e27b8ae07e11e821b183d0bba5 (diff) |
perf header: Fix double fclose() on do_write(fd, xxx) failure
cppcheck reported:
[util/header.c:983]: (error) Used file that is not opened.
Thanks to Arnaldo Carvalho de Melo for pointing out that
fclose(NULL) is undefined behavior -> protect against it.
Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Link: http://lkml.kernel.org/r/1751778.SZQB4fNdIh@storm
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r-- | tools/perf/util/header.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 7b24cf3237d8..f6081cb3fca3 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c | |||
@@ -955,6 +955,7 @@ static int write_topo_node(int fd, int node) | |||
955 | } | 955 | } |
956 | 956 | ||
957 | fclose(fp); | 957 | fclose(fp); |
958 | fp = NULL; | ||
958 | 959 | ||
959 | ret = do_write(fd, &mem_total, sizeof(u64)); | 960 | ret = do_write(fd, &mem_total, sizeof(u64)); |
960 | if (ret) | 961 | if (ret) |
@@ -981,7 +982,8 @@ static int write_topo_node(int fd, int node) | |||
981 | ret = do_write_string(fd, buf); | 982 | ret = do_write_string(fd, buf); |
982 | done: | 983 | done: |
983 | free(buf); | 984 | free(buf); |
984 | fclose(fp); | 985 | if (fp) |
986 | fclose(fp); | ||
985 | return ret; | 987 | return ret; |
986 | } | 988 | } |
987 | 989 | ||