[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 38/53] qemu-img: Fix insignificant memleak
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 38/53] qemu-img: Fix insignificant memleak |
Date: |
Mon, 3 Nov 2014 11:50:41 +0000 |
From: Max Reitz <address@hidden>
As soon as options is set in img_amend(), it needs to be freed before
the function returns. This leak is rather insignificant, as qemu-img
will exit subsequently anyway, but there's no point in not fixing it.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: BenoƮt Canet <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-img.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/qemu-img.c b/qemu-img.c
index c7b394a..66a7eb4 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2948,7 +2948,9 @@ static int img_amend(int argc, char **argv)
}
if (optind != argc - 1) {
- error_exit("Expecting one image file name");
+ error_report("Expecting one image file name");
+ ret = -1;
+ goto out;
}
flags = BDRV_O_FLAGS | BDRV_O_RDWR;
--
1.9.3
- [Qemu-devel] [PULL 28/53] qemu-img: Implement commit like QMP, (continued)
- [Qemu-devel] [PULL 28/53] qemu-img: Implement commit like QMP, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 29/53] qemu-img: Empty image after commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 30/53] qemu-img: Enable progress output for commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 31/53] qemu-img: Specify backing file for commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 32/53] iotests: Add _filter_qemu_img_map, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 33/53] iotests: Add test for backing-chain commits, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 34/53] iotests: Add test for qcow2's bdrv_make_empty, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 36/53] block: Add status callback to bdrv_amend_options(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 35/53] block: qemu-iotest 107 supports NFS, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 37/53] qemu-img: Add progress output for amend, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 38/53] qemu-img: Fix insignificant memleak,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 39/53] block/qcow2: Implement status CB for amend, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 40/53] block/qcow2: Make get_refcount() global, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 41/53] block/qcow2: Simplify shared L2 handling in amend, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 42/53] iotests: Expand test 061, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 43/53] block: acquire AioContext in generic blockjob QMP commands, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 44/53] blockdev: acquire AioContext in do_qmp_query_block_jobs_one(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 45/53] blockdev: acquire AioContext in blockdev_mark_auto_del(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 46/53] blockdev: add note that block_job_cb() must be thread-safe, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 47/53] blockjob: add block_job_defer_to_main_loop(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 48/53] block: add bdrv_drain(), Stefan Hajnoczi, 2014/11/03