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

Commit 517ed633 authored by Chris Morin's avatar Chris Morin
Browse files

fs_mgr: fix memory leak 

The fstab struct wasn't properly being freed.

Test: Ensure a user of fs_mgr (vold) runs without errors.
Change-Id: I4dcb8ae2ab3e831fbdb13372eb31a67a5d9fb735
parent db976aa5

fs_mgr/fs_mgr_fstab.cpp

+4 −3
Original line number Diff line number Diff line
@@ -654,12 +654,13 @@ static struct fstab *in_place_merge(struct fstab *a, struct fstab *b) 
    }



    for (int i = a->num_entries, j = 0; i < total_entries; i++, j++) {

        // copy the pointer directly *without* malloc and memcpy

        // Copy the structs by assignment.

        a->recs[i] = b->recs[j];

    }



    // Frees up b, but don't free b->recs[X] to make sure they are

    // accessible through a->recs[X].

    // We can't call fs_mgr_free_fstab because a->recs still references the

    // memory allocated by strdup.

    free(b->recs);

    free(b->fstab_filename);

    free(b);