diff options
| author | Alberto Garcia <berto@igalia.com> | 2018-02-09 16:42:22 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-02-13 12:27:17 +0100 |
| commit | de7269d293bc3a7fba98a0f12781eccb4ea4be1e (patch) | |
| tree | cea4e153a80df9187352f738ec720503adde5fb0 /block | |
| parent | c1a4b6f9246bf2841b14b11d4c5a029429f0659a (diff) | |
| download | qemu-de7269d293bc3a7fba98a0f12781eccb4ea4be1e.zip qemu-de7269d293bc3a7fba98a0f12781eccb4ea4be1e.tar.gz qemu-de7269d293bc3a7fba98a0f12781eccb4ea4be1e.tar.bz2 | |
qcow2: Use g_try_realloc() in qcow2_expand_zero_clusters()
g_realloc() aborts the program if it fails to allocate the required
amount of memory. We want to detect that scenario and return an error
instead, so let's use g_try_realloc().
Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow2-cluster.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 3a979bc..f077cd3 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -2070,7 +2070,15 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs, int l1_sectors = DIV_ROUND_UP(s->snapshots[i].l1_size * sizeof(uint64_t), BDRV_SECTOR_SIZE); - l1_table = g_realloc(l1_table, l1_sectors * BDRV_SECTOR_SIZE); + uint64_t *new_l1_table = + g_try_realloc(l1_table, l1_sectors * BDRV_SECTOR_SIZE); + + if (!new_l1_table) { + ret = -ENOMEM; + goto fail; + } + + l1_table = new_l1_table; ret = bdrv_read(bs->file, s->snapshots[i].l1_table_offset / BDRV_SECTOR_SIZE, |