2 files changed, 14 insertions, 10 deletions

diff --git a/src/firejail/util.c b/src/firejail/util.c
index c1a680dd4..485ddb3af 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -538,31 +538,34 @@ char *split_comma(char *str) {
 char *clean_pathname(const char *path) {
         assert(path);
         size_t len = strlen(path);
-        char *rv = calloc(len + 1, 1);
+        assert(len + 1 != 0 && path[len] == '\0');
+
+        char *rv = malloc(len + 1);
         if (!rv)
-                errExit("calloc");
+                errExit("malloc");
+
         if (len > 0) {
-                int i, j, cnt;
+                size_t i, j, cnt;
                 for (i = 0, j = 0, cnt = 0; i < len; i++) {
                         if (path[i] == '/')
                                 cnt++;
                         else
                                 cnt = 0;
+
                         if (cnt < 2) {
                                 rv[j] = path[i];
                                 j++;
                         }
                 }
+                rv[j] = '\0';
+
                 // remove a trailing slash
                 if (j > 1 && rv[j - 1] == '/')
                         rv[j - 1] = '\0';
-                size_t new_len = strlen(rv);
-                if (new_len < len) {
-                        rv = realloc(rv, new_len + 1);
-                        if (!rv)
-                                errExit("realloc");
-                }
         }
+        else
+                *rv = '\0';
+
         return rv;
 }
 
diff --git a/status b/status
index 96ad6512a..146df8600 100644
--- a/status
+++ b/status
@@ -1,5 +1,6 @@
-Oct 17, partial mainline merge
 
+Oct 12: full merge
+done: fs_whitelist: no warning if macro resolution fails because of missing…
 done: clean homedir pathname
 done: allow overriding of disable-mnt with noblacklist