summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-05-28 11:16:56 +0200
committerKevin Wolf <kwolf@redhat.com>2014-05-30 14:26:54 +0200
commita1904e48c4a9fb114d155419700bfb7d760273b9 (patch)
tree16a9728ce17874f31a424a85cf9707a0f7706138
parent75e347d66ab81944b5b657d17cc90ef92af3f016 (diff)
downloadhqemu-a1904e48c4a9fb114d155419700bfb7d760273b9.zip
hqemu-a1904e48c4a9fb114d155419700bfb7d760273b9.tar.gz
qcow2: Plug memory leak on qcow2_invalidate_cache() error paths
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>
-rw-r--r--block/qcow2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c
index a4b97e8..a54d2ba 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1308,6 +1308,7 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp)
options = qdict_clone_shallow(bs->options);
ret = qcow2_open(bs, options, flags, &local_err);
+ QDECREF(options);
if (local_err) {
error_setg(errp, "Could not reopen qcow2 layer: %s",
error_get_pretty(local_err));
@@ -1318,8 +1319,6 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp)
return;
}
- QDECREF(options);
-
if (crypt_method) {
s->crypt_method = crypt_method;
memcpy(&s->aes_encrypt_key, &aes_encrypt_key, sizeof(aes_encrypt_key));
OpenPOWER on IntegriCloud