diff options
author | Jeff Cody <jcody@redhat.com> | 2015-01-22 08:03:27 -0500 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2015-01-23 18:17:06 +0100 |
commit | 564d64bdde8e0a6b732a56fa41670e73b19ee062 (patch) | |
tree | f2de7e498b2166acc0f4b89220c6b9876fe84267 /block | |
parent | fe2065629a9c256f836770ca54449ae77b22d188 (diff) | |
download | qemu-564d64bdde8e0a6b732a56fa41670e73b19ee062.zip qemu-564d64bdde8e0a6b732a56fa41670e73b19ee062.tar.gz qemu-564d64bdde8e0a6b732a56fa41670e73b19ee062.tar.bz2 |
block: qapi - move string allocation from stack to the heap
Rather than declaring 'backing_filename2' on the stack in
bdrv_query_image_info(), dynamically allocate it on the heap.
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/qapi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/block/qapi.c b/block/qapi.c index a6fd6f7..dec9f60 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -175,7 +175,6 @@ void bdrv_query_image_info(BlockDriverState *bs, { int64_t size; const char *backing_filename; - char backing_filename2[1024]; BlockDriverInfo bdi; int ret; Error *err = NULL; @@ -211,13 +210,14 @@ void bdrv_query_image_info(BlockDriverState *bs, backing_filename = bs->backing_file; if (backing_filename[0] != '\0') { + char *backing_filename2 = g_malloc0(1024); info->backing_filename = g_strdup(backing_filename); info->has_backing_filename = true; - bdrv_get_full_backing_filename(bs, backing_filename2, - sizeof(backing_filename2), &err); + bdrv_get_full_backing_filename(bs, backing_filename2, 1024, &err); if (err) { error_propagate(errp, err); qapi_free_ImageInfo(info); + g_free(backing_filename2); return; } @@ -231,6 +231,7 @@ void bdrv_query_image_info(BlockDriverState *bs, info->backing_filename_format = g_strdup(bs->backing_format); info->has_backing_filename_format = true; } + g_free(backing_filename2); } ret = bdrv_query_snapshot_info_list(bs, &info->snapshots, &err); |