Commit c1344ded authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qcow2: Fix memory leak in qcow2_update_options() error path 



Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 007dbc39

block/qcow2.c

+10 −2
Original line number Diff line number Diff line
@@ -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;