Hi Felipe,
On Thu, 10 Oct 2013 22:21:29 -0300, Felipe Pena wrote:
> Fix for a memory leak on tracing_data_get() function when returning NULL
> explicitly
>
> Signed-off-by: Felipe Pena <[email protected]>
> ---
> tools/perf/util/trace-event-info.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/trace-event-info.c
> b/tools/perf/util/trace-event-info.c
> index f3c9e55..2a0c3c9 100644
> --- a/tools/perf/util/trace-event-info.c
> +++ b/tools/perf/util/trace-event-info.c
> @@ -518,13 +518,15 @@ struct tracing_data *tracing_data_get(struct list_head
> *pattrs,
> "/tmp/perf-XXXXXX");
> if (!mkstemp(tdata->temp_file)) {
> pr_debug("Can't make temp file");
> - return NULL;
> + err = -1;
> + goto err_tdata;
> }
>
> temp_fd = open(tdata->temp_file, O_RDWR);
> if (temp_fd < 0) {
> pr_debug("Can't read '%s'", tdata->temp_file);
> - return NULL;
> + err = -1;
> + goto err_tdata;
I'd rather initialize err to -1 at the beginning. And the malloc of
tdata should also be handled like this.
Thanks,
Namhyung
> }
>
> /*
> @@ -562,6 +564,7 @@ out:
> output_fd = fd;
> }
>
> +err_tdata:
> if (err) {
> free(tdata);
> tdata = NULL;
> --
> 1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
