diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2018-11-14 13:50:16 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-11-19 12:51:40 +0100 |
| commit | 443ba6befa2f47243def9b190c930a8a4f59f888 (patch) | |
| tree | 8596ed05392d0df4cb46bf4bfdc2564a23de3c35 | |
| parent | 441f6692ecc14859b77af2ac6d8f55e6f1354d3b (diff) | |
| download | focaccia-qemu-443ba6befa2f47243def9b190c930a8a4f59f888.tar.gz focaccia-qemu-443ba6befa2f47243def9b190c930a8a4f59f888.zip | |
vvfat: Fix memory leak
Don't leak 'cluster' in the mapping == NULL case. Found by Coverity (CID 1055918). Fixes: 8d9401c2791ee2d2805b741b1ee3006041edcd3e Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Liam Merwick <liam.merwick@oracle.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
| -rw-r--r-- | block/vvfat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index 1de5de1db4..b7b61ea8b7 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -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 ? |