lttng: fix: potential 0-length allocation in pid list parsing

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

diff --git a/src/bin/lttng/commands/track-untrack.c b/src/bin/lttng/commands/track-untrack.c
index d9e18c1d68f76ac055f3164038d155a5a7561c57..b3d8a96f61828e16da5fa260be0bb4ac8451351e 100644 (file)
--- a/src/bin/lttng/commands/track-untrack.c
+++ b/src/bin/lttng/commands/track-untrack.c
@@ -131,6 +131,11 @@ int parse_pid_string(const char *_pid_string,
                /* For next loop */
                one_pid_str = strtok_r(NULL, ",", &iter);
        }
+       if (count == 0) {
+               ERR("Fatal error occurred when parsing pid string");
+               retval = CMD_ERROR;
+               goto error;
+       }
 
        free(pid_string);
        /* Identity of delimiter has been lost in first pass. */
@@ -149,7 +154,7 @@ int parse_pid_string(const char *_pid_string,
                goto error;
        }
 
-       /* Copy */
+       /* Reparse string and populate the pid list. */
        count = 0;
        one_pid_str = strtok_r(pid_string, ",", &iter);
        while (one_pid_str != NULL) {
@@ -357,7 +362,7 @@ int cmd_track_untrack(enum cmd_type cmd_type, const char *cmd_str,
 
        ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace);
        if (ret) {
-               ret = CMD_ERROR;
+               command_ret = CMD_ERROR;
                goto end;
        }