mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmdk: Switch to heap arrays for vmdk_parent_open

Browse Source 
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2016-03-08 16:24:36 +08:00 committed by Kevin Wolf
parent 5997c210b9
commit 71968dbfd8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/vmdk.c
View File

@ -343,15 +343,16 @@ static int vmdk_reopen_prepare(BDRVReopenState *state,
static int vmdk_parent_open(BlockDriverState *bs) static int vmdk_parent_open(BlockDriverState *bs)
{ {
char *p_name; char *p_name;
char desc[DESC_SIZE + 1]; char *desc;
BDRVVmdkState *s = bs->opaque; BDRVVmdkState *s = bs->opaque;
int ret; int ret;
desc[DESC_SIZE] = '\0'; desc = g_malloc0(DESC_SIZE + 1);
ret = bdrv_pread(bs->file->bs, s->desc_offset, desc, DESC_SIZE); ret = bdrv_pread(bs->file->bs, s->desc_offset, desc, DESC_SIZE);
if (ret < 0) { if (ret < 0) {
return ret; goto out;
} }
ret = 0;
p_name = strstr(desc, "parentFileNameHint"); p_name = strstr(desc, "parentFileNameHint");
if (p_name != NULL) { if (p_name != NULL) {
@ -360,16 +361,20 @@ static int vmdk_parent_open(BlockDriverState *bs)
p_name += sizeof("parentFileNameHint") + 1; p_name += sizeof("parentFileNameHint") + 1;
end_name = strchr(p_name, '\"'); end_name = strchr(p_name, '\"');
if (end_name == NULL) { if (end_name == NULL) {
return -EINVAL; ret = -EINVAL;
goto out;
} }
if ((end_name - p_name) > sizeof(bs->backing_file) - 1) { 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); 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 /* Create and append extent to the extent array. Return the added VmdkExtent