From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UujHv-0003vw-FG for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UujHr-00006Y-Nk for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:31 -0400 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:36896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UujHr-00005w-Hu for qemu-devel@nongnu.org; Thu, 04 Jul 2013 09:09:27 -0400 From: Markus Armbruster Date: Thu, 4 Jul 2013 15:09:17 +0200 Message-Id: <1372943363-24081-2-git-send-email-armbru@redhat.com> In-Reply-To: <1372943363-24081-1-git-send-email-armbru@redhat.com> References: <1372943363-24081-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/7] qemu-option: Fix qemu_opts_find() for null id arguments List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com 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 --- util/qemu-option.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/util/qemu-option.c b/util/qemu-option.c index 412c425..2715f27 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; } -- 1.7.11.7