Messages in this thread Patch in this message | | | Date | Tue, 25 Dec 2012 17:02:04 +0100 | From | Thomas Jarosch <> | Subject | [perf PATCH] 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
Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com> --- tools/perf/util/sort.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index cfd1c0f..586d2ea 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -274,7 +274,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; @@ -284,8 +283,10 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf, *nl = '\0'; path = self->srcline; out_path: + pclose(fp); return repsep_snprintf(bf, size, "%s", path); out_ip: + pclose(fp); return repsep_snprintf(bf, size, "%-#*llx", BITS_PER_LONG / 4, self->ip); } -- 1.7.11.7
| |