projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
75e347d
)
qcow2: Plug memory leak on qcow2_invalidate_cache() error paths
author
Markus Armbruster
<armbru@redhat.com>
Wed, 28 May 2014 09:16:56 +0000
(11:16 +0200)
committer
Kevin Wolf
<kwolf@redhat.com>
Fri, 30 May 2014 12:26:54 +0000
(14:26 +0200)
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>
block/qcow2.c
patch
|
blob
|
history
diff --git
a/block/qcow2.c
b/block/qcow2.c
index a4b97e8263c307c1043754f319b2781cf83979d7..a54d2ba89710d50f4deaa535df1500386ae487de 100644
(file)
--- 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));