Changes in / [27833d8:5691653] in mainline

Location:

uspace

Files:

• lib/c/generic/vfs/vfs.c (modified) (3 diffs)
• srv/fs/fat/fat_ops.c (modified) (1 diff)

uspace/lib/c/generic/vfs/vfs.c

@@ -69 +69 @@
         char *ncwd_path;
         char *ncwd_path_nc;
-        size_t total_size; 
 
         fibril_mutex_lock(&cwd_mutex);
@@ -78 +77 @@
                         return NULL;
                 }
-                total_size = cwd_size + 1 + size + 1;
-                ncwd_path_nc = malloc(total_size);
+                ncwd_path_nc = malloc(cwd_size + 1 + size + 1);
                 if (!ncwd_path_nc) {
                         fibril_mutex_unlock(&cwd_mutex);
                         return NULL;
                 }
-                str_cpy(ncwd_path_nc, total_size, cwd_path);
+                str_cpy(ncwd_path_nc, cwd_size + 1 + size + 1, cwd_path);
                 ncwd_path_nc[cwd_size] = '/';
                 ncwd_path_nc[cwd_size + 1] = '\0';
         } else {
-                total_size = size + 1;
-                ncwd_path_nc = malloc(total_size);
+                ncwd_path_nc = malloc(size + 1);
                 if (!ncwd_path_nc) {
                         fibril_mutex_unlock(&cwd_mutex);
@@ -96 +93 @@
                 ncwd_path_nc[0] = '\0';
         }
-        str_append(ncwd_path_nc, total_size, path);
+        str_append(ncwd_path_nc, cwd_size + 1 + size + 1, path);
         ncwd_path = canonify(ncwd_path_nc, retlen);
         if (!ncwd_path) {

uspace/srv/fs/fat/fat_ops.c

@@ -325 +325 @@
                     uint16_t_le2host(d->firstc));
                 if (rc != EOK) {
-                        (void) block_put(b);
                         (void) fat_node_put(FS_NODE(nodep));
                         return rc;