[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] img_convert(): Only try to free bs[] entries if
From: |
Jes . Sorensen |
Subject: |
[Qemu-devel] [PATCH 3/7] img_convert(): Only try to free bs[] entries if bs is valid. |
Date: |
Mon, 6 Dec 2010 15:25:36 +0100 |
From: Jes Sorensen <address@hidden>
This allows for jumping to 'out:' consistently for error exit.
Signed-off-by: Jes Sorensen <address@hidden>
---
qemu-img.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index eca99c4..aded72d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -696,7 +696,8 @@ static int img_convert(int argc, char **argv)
if (bs_n > 1 && out_baseimg) {
error("-B makes no sense when concatenating multiple input images");
- return 1;
+ ret = -1;
+ goto out;
}
bs = qemu_mallocz(bs_n * sizeof(BlockDriverState *));
@@ -974,12 +975,14 @@ out:
if (out_bs) {
bdrv_delete(out_bs);
}
- for (bs_i = 0; bs_i < bs_n; bs_i++) {
- if (bs[bs_i]) {
- bdrv_delete(bs[bs_i]);
+ if (bs) {
+ for (bs_i = 0; bs_i < bs_n; bs_i++) {
+ if (bs[bs_i]) {
+ bdrv_delete(bs[bs_i]);
+ }
}
+ qemu_free(bs);
}
- qemu_free(bs);
if (ret) {
return 1;
}
--
1.7.3.2
- [Qemu-devel] [PATCH 4/7] Make error handling more consistent in img_create() and img_resize(), (continued)
- [Qemu-devel] [PATCH 4/7] Make error handling more consistent in img_create() and img_resize(), Jes . Sorensen, 2010/12/06
- [Qemu-devel] [PATCH 6/7] Fix formatting and missing braces in qemu-img.c, Jes . Sorensen, 2010/12/06
- [Qemu-devel] [PATCH 1/7] Add missing tracing to qemu_mallocz(), Jes . Sorensen, 2010/12/06
- [Qemu-devel] [PATCH 7/7] Fail if detecting an unknown option, Jes . Sorensen, 2010/12/06
- [Qemu-devel] [PATCH 3/7] img_convert(): Only try to free bs[] entries if bs is valid.,
Jes . Sorensen <=
- [Qemu-devel] Re: [PATCH v3 0/7] Cleanup qemu-img code, Kevin Wolf, 2010/12/06