2 files changed, 37 insertions, 3 deletions

diff --git a/src/firejail/run_files.c b/src/firejail/run_files.c
index 57a0e19df..361ad1414 100644
--- a/src/firejail/run_files.c
+++ b/src/firejail/run_files.c
@@ -20,6 +20,7 @@
 
 #include "firejail.h"
 #include "../include/pid.h"
+#define BUFLEN 4096
 
 static void delete_x11_run_file(pid_t pid) {
         char *fname;
@@ -74,7 +75,36 @@ void delete_run_files(pid_t pid) {
         delete_profile_run_file(pid);
 }
 
+static char *newname(char *name) {
+        char *rv;
+        pid_t pid;
+
+        // try the name
+        if (name2pid(name, &pid))
+                return name;
+
+        // try name-1 to 9
+        int i;
+        for (i = 1; i < 10; i++) {
+                if (asprintf(&rv, "%s-%d", name, i) == -1)
+                        errExit("asprintf");
+                if (name2pid(rv, &pid)) {
+                        fwarning("Sandbox name changed to %s\n", rv);
+                        return rv;
+                }
+                free(rv);
+        }
+
+        // return name-pid
+        if (asprintf(&rv, "%s-%d", name, getpid()) == -1)
+                errExit("asprintf");
+        return rv;
+}
+
+
 void set_name_run_file(pid_t pid) {
+        cfg.name = newname(cfg.name);
+
         char *fname;
         if (asprintf(&fname, "%s/%d", RUN_FIREJAIL_NAME_DIR, pid) == -1)
                 errExit("asprintf");
diff --git a/src/lib/pid.c b/src/lib/pid.c
index f138efc8c..3c804716d 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -188,10 +188,11 @@ static void print_elem(unsigned index, int nowrap) {
         uid_t uid = pids[index].uid;
         char *cmd = pid_proc_cmdline(index);
         char *user = pid_get_user_name(uid);
-        char *allocated = user;
+        char *user_allocated = user;
 
         // extract sandbox name - pid == index
         char *sandbox_name = "";
+        char *sandbox_name_allocated = NULL;
         char *fname;
         if (asprintf(&fname, "%s/%d", RUN_FIREJAIL_NAME_DIR, index) == -1)
                 errExit("asprintf");
@@ -202,6 +203,7 @@ static void print_elem(unsigned index, int nowrap) {
                         sandbox_name = malloc(s.st_size + 1);
                         if (!sandbox_name)
                                 errExit("malloc");
+                        sandbox_name_allocated = sandbox_name;
                         char *rv = fgets(sandbox_name, s.st_size + 1, fp);
                         if (!rv)
                                 *sandbox_name = '\0';
@@ -241,8 +243,10 @@ static void print_elem(unsigned index, int nowrap) {
                 else
                         printf("%s%u:\n", indent, index);
         }
-        if (allocated)
-                free(allocated);
+        if (user_allocated)
+                free(user_allocated);
+        if (sandbox_name_allocated)
+                free(sandbox_name_allocated);
 }
 
 // recursivity!!!