david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcow2: Plug memory leak on qcow2_invalidate_cache() error paths

Browse Source 
Introduced in commit 5a8a30d.  Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2014-05-28 11:16:56 +02:00 committed by Kevin Wolf
parent 75e347d66a
commit a1904e48c4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/qcow2.c
View File

@ -1308,6 +1308,7 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp)
options = qdict_clone_shallow(bs->options); options = qdict_clone_shallow(bs->options);
ret = qcow2_open(bs, options, flags, &local_err); ret = qcow2_open(bs, options, flags, &local_err);
QDECREF(options);
if (local_err) { if (local_err) {
error_setg(errp, "Could not reopen qcow2 layer: %s", error_setg(errp, "Could not reopen qcow2 layer: %s",
error_get_pretty(local_err)); error_get_pretty(local_err));
@ -1318,8 +1319,6 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp)
return; return;
} }
QDECREF(options);
if (crypt_method) { if (crypt_method) {
s->crypt_method = crypt_method; s->crypt_method = crypt_method;
memcpy(&s->aes_encrypt_key, &aes_encrypt_key, sizeof(aes_encrypt_key)); memcpy(&s->aes_encrypt_key, &aes_encrypt_key, sizeof(aes_encrypt_key));