diff options
| author | Fam Zheng <famz@redhat.com> | 2016-03-08 16:24:36 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-03-14 16:46:43 +0100 |
| commit | 71968dbfd8d190321ae54caf2ddfdf012ee97b3c (patch) | |
| tree | ba7153ebe12a42be9a0effbd4982566a60f777ee | |
| parent | 5997c210b9ed7d6dbc64aa5049eb2bc4ec574aba (diff) | |
vmdk: Switch to heap arrays for vmdk_parent_open
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/vmdk.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index c68f4563ad..03be7f0f5f 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -343,15 +343,16 @@ static int vmdk_reopen_prepare(BDRVReopenState *state, static int vmdk_parent_open(BlockDriverState *bs) { char *p_name; - char desc[DESC_SIZE + 1]; + char *desc; BDRVVmdkState *s = bs->opaque; int ret; - desc[DESC_SIZE] = '\0'; + desc = g_malloc0(DESC_SIZE + 1); ret = bdrv_pread(bs->file->bs, s->desc_offset, desc, DESC_SIZE); if (ret < 0) { - return ret; + goto out; } + ret = 0; p_name = strstr(desc, "parentFileNameHint"); if (p_name != NULL) { @@ -360,16 +361,20 @@ static int vmdk_parent_open(BlockDriverState *bs) p_name += sizeof("parentFileNameHint") + 1; end_name = strchr(p_name, '\"'); if (end_name == NULL) { - return -EINVAL; + ret = -EINVAL; + goto out; } if ((end_name - p_name) > sizeof(bs->backing_file) - 1) { - return -EINVAL; + ret = -EINVAL; + goto out; } pstrcpy(bs->backing_file, end_name - p_name + 1, p_name); } - return 0; +out: + g_free(desc); + return ret; } /* Create and append extent to the extent array. Return the added VmdkExtent |