From 67403dbba76fb294fb3a2317227f4b77037145cc Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 31 Oct 2011 11:49:21 +0100 Subject: [PATCH] qemu-io: Fix multiwrite_f error handling Without this fix, some qiovs can be leaked if an error occurs. Also a semicolon at the end of the command line would make the code walk beyond the end of argv. Signed-off-by: Kevin Wolf --- qemu-io.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 1c49d447a..de26422fc 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -960,21 +960,21 @@ static int multiwrite_f(int argc, char **argv) buf = g_malloc0(nr_reqs * sizeof(*buf)); qiovs = g_malloc(nr_reqs * sizeof(*qiovs)); - for (i = 0; i < nr_reqs; i++) { + for (i = 0; i < nr_reqs && optind < argc; i++) { int j; /* Read the offset of the request */ offset = cvtnum(argv[optind]); if (offset < 0) { printf("non-numeric offset argument -- %s\n", argv[optind]); - return 0; + goto out; } optind++; if (offset & 0x1ff) { printf("offset %lld is not sector aligned\n", (long long)offset); - return 0; + goto out; } if (i == 0) { @@ -1005,6 +1005,9 @@ static int multiwrite_f(int argc, char **argv) pattern++; } + /* If there were empty requests at the end, ignore them */ + nr_reqs = i; + gettimeofday(&t1, NULL); cnt = do_aio_multiwrite(reqs, nr_reqs, &total); gettimeofday(&t2, NULL); -- 2.39.5