Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eb44dd7 authored by Thomas Jarosch's avatar Thomas Jarosch Committed by Arnaldo Carvalho de Melo
Browse files

perf sort: Use pclose() instead of fclose() on pipe stream 



cppcheck message:
[tools/perf/util/sort.c:277]: (error) Mismatching allocation and deallocation: fp

Also fix descriptor leak on error and always initialize the "fp" variable.

Signed-off-by: default avatarThomas Jarosch <thomas.jarosch@intra2net.com>
Link: http://lkml.kernel.org/r/1359112354.yZcisNZ4k0@storm
Link: http://lkml.kernel.org/r/2266358.qvDXKLvJ67@storm


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 68c465ad

tools/perf/util/sort.c

+5 −2
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf, 
					size_t size,

					unsigned int width __maybe_unused)

{

	FILE *fp;

	FILE *fp = NULL;

	char cmd[PATH_MAX + 2], *path = self->srcline, *nl;

	size_t line_len;
@@ -270,7 +270,6 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf, 


	if (getline(&path, &line_len, fp) < 0 || !line_len)

		goto out_ip;

	fclose(fp);

	self->srcline = strdup(path);

	if (self->srcline == NULL)

		goto out_ip;
@@ -280,8 +279,12 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf, 
		*nl = '\0';

	path = self->srcline;

out_path:

	if (fp)

		pclose(fp);

	return repsep_snprintf(bf, size, "%s", path);

out_ip:

	if (fp)

		pclose(fp);

	return repsep_snprintf(bf, size, "%-#*llx", BITS_PER_LONG / 4, self->ip);

}