leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Thomas 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Thomas Jarosch
2013-01-25 11:02:13 +01:00
committed by Arnaldo Carvalho de Melo
parent 68c465ada5
commit 8eb44dd76a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/perf/util/sort.c
View File

@@ -249,7 +249,7 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf,
size_t size, size_t size,
unsigned int width __maybe_unused) unsigned int width __maybe_unused)
{ {
FILE *fp; FILE *fp = NULL;
char cmd[PATH_MAX + 2], *path = self->srcline, *nl; char cmd[PATH_MAX + 2], *path = self->srcline, *nl;
size_t line_len; 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) if (getline(&path, &line_len, fp) < 0 || !line_len)
goto out_ip; goto out_ip;
fclose(fp);
self->srcline = strdup(path); self->srcline = strdup(path);
if (self->srcline == NULL) if (self->srcline == NULL)
goto out_ip; goto out_ip;
@@ -280,8 +279,12 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf,
*nl = '\0'; *nl = '\0';
path = self->srcline; path = self->srcline;
out_path: out_path:
if (fp)
pclose(fp);
return repsep_snprintf(bf, size, "%s", path); return repsep_snprintf(bf, size, "%s", path);
out_ip: out_ip:
if (fp)
pclose(fp);
return repsep_snprintf(bf, size, "%-#*llx", BITS_PER_LONG / 4, self->ip); return repsep_snprintf(bf, size, "%-#*llx", BITS_PER_LONG / 4, self->ip);
} }