[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] qemu-option: Fix qemu_opts_find() for null id a
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 1/7] qemu-option: Fix qemu_opts_find() for null id arguments |
Date: |
Thu, 4 Jul 2013 15:09:17 +0200 |
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 <address@hidden>
---
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
[Qemu-devel] [PATCH 2/7] qemu-option: Fix qemu_opts_set_defaults() for corner cases, Markus Armbruster, 2013/07/04
[Qemu-devel] [PATCH 1/7] qemu-option: Fix qemu_opts_find() for null id arguments,
Markus Armbruster <=
[Qemu-devel] [PATCH 5/7] microblaze: Fix latent bug with default DTB lookup, Markus Armbruster, 2013/07/04
[Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Markus Armbruster, 2013/07/04
- Re: [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Peter Maydell, 2013/07/04
- Re: [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Markus Armbruster, 2013/07/04
- Re: [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Peter Maydell, 2013/07/04
- Re: [Qemu-devel] [PATCH 4/7] Fix -machine options accel, kernel_irqchip, kvm_shadow_mem, Markus Armbruster, 2013/07/04
[Qemu-devel] [PATCH 7/7] vl: Tighten parsing of -machine option phandle_start, Markus Armbruster, 2013/07/04