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 59bf53d94a4a57476e7526768a1bb97277a3fdcf..3073996a9f6d19acfa257e87b1075959a9da3521 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. */
@@ -257,8 +262,14 @@ enum cmd_error_code track_untrack_pid(enum cmd_type cmd_type, const char *cmd_st
                                break;
                        }
                } else {
-                       MSG("PID %i %sed in session %s",
-                                       pid_list[i], cmd_str, session_name);
+                       if (pid_list[i] != -1) {
+                               MSG("PID %i %sed in session %s",
+                                               pid_list[i], cmd_str,
+                                               session_name);
+                       } else {
+                               MSG("All PIDs %sed in session %s",
+                                               cmd_str, session_name);
+                       }
                        success = 1;
                }
 
@@ -357,7 +368,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;
        }