diff options
author | Max Reitz <mreitz@redhat.com> | 2018-05-02 22:20:50 +0200 |
---|---|---|
committer | Max Reitz <mreitz@redhat.com> | 2018-05-15 16:15:21 +0200 |
commit | 4615f87832d2fcb7a544bedeece2741bf8c21f94 (patch) | |
tree | 2710d1ae05b64d7fb8d7c9b2bdcf82901f160c7d /qemu-img.c | |
parent | 2a01c01f9ecb43af4c0a85fe6adc429ffc9c31b5 (diff) | |
download | qemu-4615f87832d2fcb7a544bedeece2741bf8c21f94.zip qemu-4615f87832d2fcb7a544bedeece2741bf8c21f94.tar.gz qemu-4615f87832d2fcb7a544bedeece2741bf8c21f94.tar.bz2 |
qemu-img: Use only string options in img_open_opts
img_open_opts() takes a QemuOpts and converts them to a QDict, so all
values therein are strings. Then it may try to call qdict_get_bool(),
however, which will fail with a segmentation fault every time:
$ ./qemu-img info -U --image-opts \
driver=file,filename=/dev/null,force-share=off
[1] 27869 segmentation fault (core dumped) ./qemu-img info -U
--image-opts driver=file,filename=/dev/null,force-share=off
Fix this by using qdict_get_str() and comparing the value as a string.
Also, when adding a force-share value to the QDict, add it as a string
so it fits the rest of the dict.
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20180502202051.15493-3-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r-- | qemu-img.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -277,12 +277,12 @@ static BlockBackend *img_open_opts(const char *optstr, options = qemu_opts_to_qdict(opts, NULL); if (force_share) { if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE) - && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) { + && strcmp(qdict_get_str(options, BDRV_OPT_FORCE_SHARE), "on")) { error_report("--force-share/-U conflicts with image options"); qobject_unref(options); return NULL; } - qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true); + qdict_put_str(options, BDRV_OPT_FORCE_SHARE, "on"); } blk = blk_new_open(NULL, NULL, options, flags, &local_err); if (!blk) { |