[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] block: fix vvfat s->qcow leak on error
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH] block: fix vvfat s->qcow leak on error |
Date: |
Wed, 17 Jul 2013 15:12:25 +0800 |
s->qcow is allocated but not freed if bdrv_open fails. Fix the possible
leak, remove unnecessary check for bdrv_new(), honor error code of
bdrv_create().
Signed-off-by: Fam Zheng <address@hidden>
---
block/vvfat.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index 87b0279..733f382 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -2927,18 +2927,18 @@ static int enable_write_target(BDRVVVFATState *s)
set_option_parameter_int(options, BLOCK_OPT_SIZE, s->sector_count * 512);
set_option_parameter(options, BLOCK_OPT_BACKING_FILE, "fat:");
- if (bdrv_create(bdrv_qcow, s->qcow_filename, options) < 0)
- return -1;
+ ret = bdrv_create(bdrv_qcow, s->qcow_filename, options);
+ if (ret < 0) {
+ return ret;
+ }
s->qcow = bdrv_new("");
- if (s->qcow == NULL) {
- return -1;
- }
ret = bdrv_open(s->qcow, s->qcow_filename, NULL,
BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, bdrv_qcow);
if (ret < 0) {
- return ret;
+ bdrv_delete(s->qcow);
+ return ret;
}
#ifndef _WIN32
--
1.8.3.2
- [Qemu-devel] [PATCH] block: fix vvfat s->qcow leak on error,
Fam Zheng <=