3 files changed, 23 insertions, 20 deletions

diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index 2d4640430..6dd4a7e2d 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -430,7 +430,7 @@ void fs_whitelist(void) {
 
                         // if 1 the file was not found; mount an empty directory
                         if (!nowhitelist_flag) {
-                                if (strncmp(new_name, cfg.homedir, strlen(cfg.homedir)) == 0) {
+                                if (strncmp(new_name, cfg.homedir, strlen(cfg.homedir)) == 0 && new_name[strlen(cfg.homedir)] == '/') {
                                         if(!arg_private)
                                                 home_dir = 1;
                                 }
diff --git a/src/firejail/util.c b/src/firejail/util.c
index 4a164901d..ae07a42b0 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -636,33 +636,33 @@ void extract_command_name(int index, char **argv) {
         if (!cfg.command_name)
                 errExit("strdup");
 
-        // restrict the command name to the first word
-        char *ptr = cfg.command_name;
-        while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0')
-                ptr++;
-        *ptr = '\0';
-
         // remove the path: /usr/bin/firefox becomes firefox
-        ptr = strrchr(cfg.command_name, '/');
+        char *basename = cfg.command_name;
+        char *ptr = strrchr(cfg.command_name, '/');
         if (ptr) {
-                ptr++;
+                basename = ++ptr;
                 if (*ptr == '\0') {
                         fprintf(stderr, "Error: invalid command name\n");
                         exit(1);
                 }
+        }
+        else
+                ptr = basename;
 
-                char *tmp = strdup(ptr);
-                if (!tmp)
-                        errExit("strdup");
+        // restrict the command name to the first word
+        while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0')
+                ptr++;
 
-                // limit the command to the first ' '
-                char *ptr2 = tmp;
-                while (*ptr2 != ' ' && *ptr2 != '\0')
-                        ptr2++;
-                *ptr2 = '\0';
+        // command name is a substring of cfg.command_name
+        if (basename != cfg.command_name || *ptr != '\0') {
+                *ptr = '\0';
+                
+                basename = strdup(basename);
+                if (!basename)
+                        errExit("strdup");
 
                 free(cfg.command_name);
-                cfg.command_name = tmp;
+                cfg.command_name = basename;
         }
 }
 
diff --git a/src/lib/pid.c b/src/lib/pid.c
index 75576c787..ee1550e57 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -359,7 +359,10 @@ void pid_read(pid_t mon_pid) {
                 char buf[PIDS_BUFLEN];
                 while (fgets(buf, PIDS_BUFLEN - 1, fp)) {
                         if (strncmp(buf, "Name:", 5) == 0) {
-                                char *ptr = buf + 5;
+                                char *ptr = strchr(buf, '\n');
+                                if (ptr)
+                                        *ptr = '\0';
+                                ptr = buf + 5;
                                 while (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t')) {
                                         ptr++;
                                 }
@@ -368,7 +371,7 @@ void pid_read(pid_t mon_pid) {
                                         exit(1);
                                 }
 
-                                if ((strncmp(ptr, "firejail", 8) == 0) && (mon_pid == 0 || mon_pid == pid)) {
+                                if ((strcmp(ptr, "firejail") == 0) && (mon_pid == 0 || mon_pid == pid)) {
                                         if (pid_proc_cmdline_x11_xpra_xephyr(pid))
                                                 pids[pid].level = -1;
                                         else