Merge pull request #5613 from layderv/escape-cntrl-sequences

modif: Escape control characters of the command line

1 files changed, 15 insertions, 1 deletions

diff --git a/src/lib/pid.c b/src/lib/pid.c
index 5e9b20c94..2e73e85f6 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -197,6 +197,12 @@ static void print_elem(unsigned index, int nowrap) {
         char *user = pid_get_user_name(uid);
         char *user_allocated = user;
 
+        char *cmd_escaped = escape_cntrl_chars(cmd);
+        if (cmd_escaped) {
+                free(cmd);
+                cmd = cmd_escaped;
+        }
+
         // extract sandbox name - pid == index
         char *sandbox_name = "";
         char *sandbox_name_allocated = NULL;
@@ -224,7 +230,15 @@ static void print_elem(unsigned index, int nowrap) {
         }
         free(fname);
 
-        if (user ==NULL)
+        char *sandbox_name_escaped = escape_cntrl_chars(sandbox_name);
+        if (sandbox_name_escaped) {
+                if (sandbox_name_allocated)
+                        free(sandbox_name_allocated);
+                sandbox_name = sandbox_name_escaped;
+                sandbox_name_allocated = sandbox_name;
+        }
+
+        if (user == NULL)
                 user = "";
         if (cmd) {
                 if (col < 4 || nowrap)