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

modif: Escape control characters of the command line

3 files changed, 74 insertions, 1 deletions

diff --git a/src/include/common.h b/src/include/common.h
index ed6560701..dc80e678d 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -143,6 +143,7 @@ int pid_proc_cmdline_x11_xpra_xephyr(const pid_t pid);
 int pid_hidepid(void);
 char *do_replace_cntrl_chars(char *str, char c);
 char *replace_cntrl_chars(const char *str, char c);
+char *escape_cntrl_chars(const char *str);
 int has_cntrl_chars(const char *str);
 void reject_cntrl_chars(const char *fname);
 void reject_meta_chars(const char *fname, int globbing);
diff --git a/src/lib/common.c b/src/lib/common.c
index 111366782..44ff2ab98 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -404,6 +404,64 @@ char *replace_cntrl_chars(const char *str, char c) {
         return rv;
 }
 
+// Replaces each control character in str with an escape sequence, such as by
+// replacing '\n' (0x0a) with "\\n" (0x5c6e).
+char *escape_cntrl_chars(const char *str) {
+        if (str == NULL)
+                return NULL;
+
+        unsigned int cntrl_chars = 0;
+        const char *c = str;
+        while (*c) {
+                switch (*c++) {
+                case '\b':
+                case '\a':
+                case '\e':
+                case '\f':
+                case '\n':
+                case '\r':
+                case '\t':
+                case '\v':
+                case '\"':
+                case '\'':
+                case '\?':
+                case '\\':
+                        ++cntrl_chars;
+                default:
+                        break;
+                }
+        }
+        char *ptr, *rv = malloc(strlen(str) + cntrl_chars + 1);
+        if (!rv)
+                errExit("malloc");
+        ptr = rv;
+        c = str;
+        while (*c) {
+                if (iscntrl(*c)) {
+                        *ptr++ = '\\';
+                        switch (*c) {
+                        case '\b': *ptr++ = 'b'; break;
+                        case '\a': *ptr++ = 'a'; break;
+                        case '\e': *ptr++ = 'e'; break;
+                        case '\f': *ptr++ = 'f'; break;
+                        case '\n': *ptr++ = 'n'; break;
+                        case '\r': *ptr++ = 'r'; break;
+                        case '\t': *ptr++ = 't'; break;
+                        case '\v': *ptr++ = 'v'; break;
+                        case '\"': *ptr++ = '\"'; break;
+                        case '\'': *ptr++ = '\''; break;
+                        case '\?': *ptr++ = '?'; break;
+                        case '\\': *ptr++ = '\\'; break;
+                        }
+                } else {
+                        *ptr++ = *c;
+                }
+                c++;
+        }
+        *ptr = '\0';
+        return rv;
+}
+
 int has_cntrl_chars(const char *str) {
         assert(str);
 
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)