OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Kevin Wolf 2015-04-17 16:35:50 +02:00
parent 007dbc396c
commit c1344ded70
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/qcow2.c
View File

@ -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;