Fix: Memory leaks when calling get_cmdline_by_pid

[lttng-tools.git] / src / bin / lttng / commands / list.c

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 48b2c82763e3bb69a40987e9f42f41e765355037..5429df4e2eacc9dbdc1c1b1186999046b3732309 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -294,6 +294,7 @@ static int list_ust_events(void)
        struct lttng_handle *handle;
        struct lttng_event *event_list;
        pid_t cur_pid = 0;
+       char *cmdline = NULL;
 
        memset(&domain, 0, sizeof(domain));
 
@@ -322,7 +323,9 @@ static int list_ust_events(void)
        for (i = 0; i < size; i++) {
                if (cur_pid != event_list[i].pid) {
                        cur_pid = event_list[i].pid;
-                       MSG("\nPID: %d - Name: %s", cur_pid, get_cmdline_by_pid(cur_pid));
+                       cmdline = get_cmdline_by_pid(cur_pid);
+                       MSG("\nPID: %d - Name: %s", cur_pid, cmdline);
+                       free(cmdline);
                }
                print_events(&event_list[i]);
        }
@@ -349,6 +352,8 @@ static int list_ust_event_fields(void)
        struct lttng_handle *handle;
        struct lttng_event_field *event_field_list;
        pid_t cur_pid = 0;
+       char *cmdline = NULL;
+
        struct lttng_event cur_event;
 
        memset(&domain, 0, sizeof(domain));
@@ -379,7 +384,9 @@ static int list_ust_event_fields(void)
        for (i = 0; i < size; i++) {
                if (cur_pid != event_field_list[i].event.pid) {
                        cur_pid = event_field_list[i].event.pid;
-                       MSG("\nPID: %d - Name: %s", cur_pid, get_cmdline_by_pid(cur_pid));
+                       cmdline = get_cmdline_by_pid(cur_pid);
+                       MSG("\nPID: %d - Name: %s", cur_pid, cmdline);
+                       free(cmdline);
                }
                if (strcmp(cur_event.name, event_field_list[i].event.name) != 0) {
                        print_events(&event_field_list[i].event);
@@ -474,9 +481,7 @@ static int list_events(const char *channel_name)
        MSG("");
 
 end:
-       if (events) {
-               free(events);
-       }
+       free(events);
        ret = CMD_SUCCESS;
 
 error:
@@ -744,6 +749,7 @@ int cmd_list(int argc, const char **argv)
                if (opt_kernel) {
                        ret = list_kernel_events();
                        if (ret < 0) {
+                               ret = CMD_ERROR;
                                goto end;
                        }
                }
@@ -754,6 +760,7 @@ int cmd_list(int argc, const char **argv)
                                ret = list_ust_events();
                        }
                        if (ret < 0) {
+                               ret = CMD_ERROR;
                                goto end;
                        }
                }
@@ -819,9 +826,7 @@ int cmd_list(int argc, const char **argv)
        }
 
 end:
-       if (domains) {
-               free(domains);
-       }
+       free(domains);
        if (handle) {
                lttng_destroy_handle(handle);
        }