Commit 443ba6be authored by Kevin Wolf's avatar Kevin Wolf
Browse files

vvfat: Fix memory leak 



Don't leak 'cluster' in the mapping == NULL case. Found by Coverity
(CID 1055918).

Fixes: 8d9401c2
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarLiam Merwick <liam.merwick@oracle.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 441f6692

block/vvfat.c

+3 −3
Original line number Diff line number Diff line
@@ -2510,7 +2510,7 @@ static int commit_one_file(BDRVVVFATState* s, 
    uint32_t first_cluster = c;

    mapping_t* mapping = find_mapping_for_cluster(s, c);

    uint32_t size = filesize_of_direntry(direntry);

    char* cluster = g_malloc(s->cluster_size);

    char *cluster;

    uint32_t i;

    int fd = 0;
@@ -2528,17 +2528,17 @@ static int commit_one_file(BDRVVVFATState* s, 
    if (fd < 0) {

        fprintf(stderr, "Could not open %s... (%s, %d)\n", mapping->path,

                strerror(errno), errno);

        g_free(cluster);

        return fd;

    }

    if (offset > 0) {

        if (lseek(fd, offset, SEEK_SET) != offset) {

            qemu_close(fd);

            g_free(cluster);

            return -3;

        }

    }



    cluster = g_malloc(s->cluster_size);



    while (offset < size) {

        uint32_t c1;

        int rest_size = (size - offset > s->cluster_size ?