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

Commit b22632cd authored by Christopher Morin's avatar Christopher Morin Committed by android-build-merger
Browse files

Merge "fs_mgr: fix memory leak" am: 9bbcea18 am: 9b205334

am: a7f3fef5

Change-Id: Idc2b90bc0a66131769b006f10f09cf92d3c4ccee
parents 672fbe53 a7f3fef5
Loading
Loading
Loading
Loading
+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);