[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/14] img_convert(): Only try to free bs[] entries
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 04/14] img_convert(): Only try to free bs[] entries if bs is valid. |
Date: |
Thu, 9 Dec 2010 12:10:00 +0100 |
From: Jes Sorensen <address@hidden>
This allows for jumping to 'out:' consistently for error exit.
Signed-off-by: Jes Sorensen <address@hidden>
Signed-off-by: Kevin Wolf <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.2.3
- [Qemu-devel] [PULL 00/14] Block patches, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 01/14] block: Make bdrv_create_file() ':' handling consistent, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 03/14] Use qemu_mallocz() instead of calloc() in img_convert(), Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 02/14] Add missing tracing to qemu_mallocz(), Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 05/14] Consolidate printing of block driver options, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 07/14] Fail if detecting an unknown option, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 06/14] Fix formatting and missing braces in qemu-img.c, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 04/14] img_convert(): Only try to free bs[] entries if bs is valid.,
Kevin Wolf <=
- [Qemu-devel] [PATCH 08/14] Make error handling more consistent in img_create() and img_resize(), Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 10/14] qemu-img: Deprecate obsolete -6 and -e options, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 11/14] qemu-option: Don't reinvent append_option_parameters(), Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 12/14] qemu-option: Fix parse_option_parameters() documentation typo, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 09/14] ceph/rbd block driver for qemu-kvm, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 14/14] qemu-img: Fail creation if backing format is invalid, Kevin Wolf, 2010/12/09
- [Qemu-devel] [PATCH 13/14] qemu-img: Free option parameter lists in img_create(), Kevin Wolf, 2010/12/09
- [Qemu-devel] Re: [PULL 00/14] Block patches, Kevin Wolf, 2010/12/15
- Re: [Qemu-devel] [PULL 00/14] Block patches, Anthony Liguori, 2010/12/17