]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
qemu-io: Fix memory leak
authorKevin Wolf <kwolf@redhat.com>
Wed, 18 Nov 2009 09:42:59 +0000 (10:42 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Sat, 19 Dec 2009 14:26:20 +0000 (08:26 -0600)
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 40a0d7c395f4d18a8061ba075d8f9aab2fa0ec2a)

qemu-io.c

index 3f7f222a6bbd7425fb26c296e4bfea5bc8e9f494..a0307ae82fb623d7b2e487f847868a94231fb991 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -129,7 +129,8 @@ create_iovec(QEMUIOVector *qiov, char **argv, int nr_iov, int pattern)
 {
        size_t *sizes = calloc(nr_iov, sizeof(size_t));
        size_t count = 0;
-       void *buf, *p;
+       void *buf = NULL;
+       void *p;
        int i;
 
        for (i = 0; i < nr_iov; i++) {
@@ -139,19 +140,19 @@ create_iovec(QEMUIOVector *qiov, char **argv, int nr_iov, int pattern)
                len = cvtnum(arg);
                if (len < 0) {
                        printf("non-numeric length argument -- %s\n", arg);
-                       return NULL;
+                       goto fail;
                }
 
                /* should be SIZE_T_MAX, but that doesn't exist */
                if (len > UINT_MAX) {
                        printf("too large length argument -- %s\n", arg);
-                       return NULL;
+                       goto fail;
                }
 
                if (len & 0x1ff) {
                        printf("length argument %lld is not sector aligned\n",
                                len);
-                       return NULL;
+                       goto fail;
                }
 
                sizes[i] = len;
@@ -167,6 +168,7 @@ create_iovec(QEMUIOVector *qiov, char **argv, int nr_iov, int pattern)
                p += sizes[i];
        }
 
+fail:
        free(sizes);
        return buf;
 }