When an error occur a error value is just returned
without freeing the session. So allocating and freeing
session have to be matched as a pair even if an error occur.

Signed-off-by: Taeung Song <treeze.tae...@gmail.com>
---
 tools/perf/builtin-mem.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c
index da2ec06..8b6d473 100644
--- a/tools/perf/builtin-mem.c
+++ b/tools/perf/builtin-mem.c
@@ -135,24 +135,27 @@ static int report_raw_events(struct perf_mem *mem)
        if (mem->cpu_list) {
                ret = perf_session__cpu_bitmap(session, mem->cpu_list,
                                               mem->cpu_bitmap);
-               if (ret)
+               if (ret) {
+                       ret = err;
                        goto out_delete;
+               }
        }
 
-       if (symbol__init(&session->header.env) < 0)
-               return -1;
+       ret = symbol__init(&session->header.env);
+       if (ret < 0)
+               goto out_delete;
 
        printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n");
 
        err = perf_session__process_events(session);
        if (err)
-               return err;
-
-       return 0;
+               ret = err;
+       else
+               ret = 0;
 
 out_delete:
        perf_session__delete(session);
-       return err;
+       return ret;
 }
 
 static int report_events(int argc, const char **argv, struct perf_mem *mem)
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to