aboutsummaryrefslogtreecommitdiff
path: root/block/qcow2.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2015-04-17 16:35:50 +0200
committerKevin Wolf <kwolf@redhat.com>2015-09-14 16:51:36 +0200
commitc1344ded70cf7d471aeb6fc08134997414631811 (patch)
tree21d6ed44367ef233ee2eee74e1c0c1b85c318e14 /block/qcow2.c
parent007dbc396cfc613d72ecea7744fe7398b300aa7d (diff)
qcow2: Fix memory leak in qcow2_update_options() error path
Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block/qcow2.c')
-rw-r--r--block/qcow2.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c
index c61d996f14..374a56d565 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -597,8 +597,8 @@ static int qcow2_update_options(BlockDriverState *bs, QDict *options,
const char *opt_overlap_check, *opt_overlap_check_template;
int overlap_check_template = 0;
uint64_t l2_cache_size, refcount_cache_size;
- Qcow2Cache *l2_table_cache;
- Qcow2Cache *refcount_block_cache;
+ Qcow2Cache *l2_table_cache = NULL;
+ Qcow2Cache *refcount_block_cache = NULL;
uint64_t cache_clean_interval;
bool use_lazy_refcounts;
int i;
@@ -735,6 +735,14 @@ static int qcow2_update_options(BlockDriverState *bs, QDict *options,
ret = 0;
fail:
+ if (ret < 0) {
+ if (l2_table_cache) {
+ qcow2_cache_destroy(bs, l2_table_cache);
+ }
+ if (refcount_block_cache) {
+ qcow2_cache_destroy(bs, refcount_block_cache);
+ }
+ }
qemu_opts_del(opts);
opts = NULL;