From 96bc97ebf350ec480b69082819cedb8850f46a0f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 4 Jul 2013 15:09:17 +0200 Subject: qemu-option: Fix qemu_opts_find() for null id arguments Crashes when the first list member has an ID. Admittedly nonsensical reproducer: $ qemu-system-x86_64 -nodefaults -machine id=foo -machine "" Signed-off-by: Markus Armbruster Reviewed-by: Peter Maydell Message-id: 1372943363-24081-2-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori --- util/qemu-option.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'util') diff --git a/util/qemu-option.c b/util/qemu-option.c index 412c425518..2715f27e41 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -706,16 +706,12 @@ QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id) QemuOpts *opts; QTAILQ_FOREACH(opts, &list->head, next) { - if (!opts->id) { - if (!id) { - return opts; - } - continue; + if (!opts->id && !id) { + return opts; } - if (strcmp(opts->id, id) != 0) { - continue; + if (opts->id && id && !strcmp(opts->id, id)) { + return opts; } - return opts; } return NULL; } -- cgit v1.2.1