Changeset a49c39c8 in mainline for uspace/lib/ext4/src/filesystem.c

Timestamp:

2018-12-21T17:43:08Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

59564e6, 8ee106b

Parents:

4a33845 (diff), 7bdedb5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Maurizio Lombardi <m.lombardi85@…> (2018-12-21 17:43:08)

git-committer:

GitHub <noreply@…> (2018-12-21 17:43:08)

Message:

Merge pull request #145 from maurizio-lombardi/ext4_init_dfree

libext4: fix double free in case ext4_filesystem_open() fails.

File:

• uspace/lib/ext4/src/filesystem.c (modified) (3 diffs)

uspace/lib/ext4/src/filesystem.c

@@ -421 +421 @@
     enum cache_mode cmode, aoff64_t *size, ext4_filesystem_t **rfs)
 {
+        int fs_inited = 0;
         ext4_filesystem_t *fs = NULL;
         fs_node_t *root_node = NULL;
@@ -437 +438 @@
         if (rc != EOK)
                 goto error;
+
+        fs_inited = 1;
 
         /* Read root node */
@@ -463 +466 @@
                 ext4_node_put(root_node);
 
-        if (fs != NULL) {
+        if (fs_inited)
                 ext4_filesystem_fini(fs);
-                free(fs);
-        }
-
+        free(fs);
         return rc;
 }