Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d431b8d7 authored by Irina Tirdea's avatar Irina Tirdea Committed by Elliott Hughes
Browse files

Fix fstab memory leak 



When reading the fstab config file fails, fstab memory is not freed.
When fstab structure is no longer needed, only half of it is freed.

Free fstab memory in all cases (error or when it is no longer needed).

Change-Id: Ib0758a5aaa69505285bf64143632986a2dbbdccb
Signed-off-by: default avatarIrina Tirdea <irina.tirdea@intel.com>
parent 810ff696

fs_mgr/fs_mgr.c

+4 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ struct fstab *fs_mgr_read_fstab(const char *fstab_path) 
    char *line = NULL;

    const char *delim = " \t";

    char *save_ptr, *p;

    struct fstab *fstab;

    struct fstab *fstab = NULL;

    struct fstab_rec *recs;

    char *key_loc;

    long long part_length;
@@ -345,7 +345,10 @@ struct fstab *fs_mgr_read_fstab(const char *fstab_path) 
    return fstab;



err:

    fclose(fstab_file);

    free(line);

    if (fstab)

        fs_mgr_free_fstab(fstab);

    return NULL;

}
@@ -361,7 +364,6 @@ void fs_mgr_free_fstab(struct fstab *fstab) 
        free(fstab->recs[i].fs_options);

        free(fstab->recs[i].key_loc);

        free(fstab->recs[i].label);

        i++;

    }



    /* Free the fstab_recs array created by calloc(3) */