[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/34] qcow2: Fix memory leak in qcow2_update_option
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 18/34] qcow2: Fix memory leak in qcow2_update_options() error path |
Date: |
Fri, 8 May 2015 19:21:50 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index abe22f3..84d6e0f 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -546,8 +546,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;
bool use_lazy_refcounts;
int i;
Error *local_err = NULL;
@@ -670,6 +670,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;
--
1.8.3.1