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

Commit a2a93250 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak" 

* commit 'c67bd8d7':
  Fix fstab memory leak
parents 9f25b565 c67bd8d7

fs_mgr/fs_mgr.c

+4 −2
Original line number Diff line number Diff line
@@ -244,7 +244,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;

    struct fs_mgr_flag_values flag_vals;

#define FS_OPTIONS_LEN 1024
@@ -363,7 +363,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;

}
@@ -379,7 +382,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) */