Commit 5809fde0 authored Jan 28, 2013 by Thomas Jarosch Committed by Arnaldo Carvalho de Melo Jan 30, 2013

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>

parent fdae6373

tools/perf/util/header.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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,6 +982,7 @@ static int write_topo_node(int fd, int node)
		ret = do_write_string(fd, buf);
		done:
		free(buf);
		if (fp)
		fclose(fp);
		return ret;
		}