* [perf PATCH v2] Fix double fclose() on do_write(fd, xxx) failure
@ 2013-01-28 9:21 Thomas Jarosch
2013-01-31 11:04 ` [tip:perf/core] perf header: " tip-bot for Thomas Jarosch
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Jarosch @ 2013-01-28 9:21 UTC (permalink / raw)
To: acme; +Cc: linux-kernel
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>
---
| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 7b24cf3..f6081cb 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)
}
fclose(fp);
+ fp = NULL;
ret = do_write(fd, &mem_total, sizeof(u64));
if (ret)
@@ -981,7 +982,8 @@ static int write_topo_node(int fd, int node)
ret = do_write_string(fd, buf);
done:
free(buf);
- fclose(fp);
+ if (fp)
+ fclose(fp);
return ret;
}
--
1.7.11.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:perf/core] perf header: Fix double fclose() on do_write(fd, xxx) failure
2013-01-28 9:21 [perf PATCH v2] Fix double fclose() on do_write(fd, xxx) failure Thomas Jarosch
@ 2013-01-31 11:04 ` tip-bot for Thomas Jarosch
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Thomas Jarosch @ 2013-01-31 11:04 UTC (permalink / raw)
To: linux-tip-commits; +Cc: acme, linux-kernel, hpa, mingo, thomas.jarosch, tglx
Commit-ID: 5809fde040de2afa477a6c593ce2e8fd2c11d9d3
Gitweb: http://git.kernel.org/tip/5809fde040de2afa477a6c593ce2e8fd2c11d9d3
Author: Thomas Jarosch <thomas.jarosch@intra2net.com>
AuthorDate: Mon, 28 Jan 2013 10:21:14 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 30 Jan 2013 10:40:44 -0300
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>
---
| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 7b24cf3..f6081cb 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)
}
fclose(fp);
+ fp = NULL;
ret = do_write(fd, &mem_total, sizeof(u64));
if (ret)
@@ -981,7 +982,8 @@ static int write_topo_node(int fd, int node)
ret = do_write_string(fd, buf);
done:
free(buf);
- fclose(fp);
+ if (fp)
+ fclose(fp);
return ret;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-31 11:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-28 9:21 [perf PATCH v2] Fix double fclose() on do_write(fd, xxx) failure Thomas Jarosch
2013-01-31 11:04 ` [tip:perf/core] perf header: " tip-bot for Thomas Jarosch
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.