aboutsummaryrefslogtreecommitdiff
path: root/util/qemu-option.c
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2018-05-14 18:19:11 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2018-07-17 16:24:49 +0200
commit6e3ad3f0e31b8e31c6c0769d0f474bcd9673e0e5 (patch)
tree98440f9f2338ff22bcf880a63c4d72baec2e2243 /util/qemu-option.c
parent8449bcf94986156a1476d6647c75ec1ce3db64d0 (diff)
downloadqemu-6e3ad3f0e31b8e31c6c0769d0f474bcd9673e0e5.zip
qemu-6e3ad3f0e31b8e31c6c0769d0f474bcd9673e0e5.tar.gz
qemu-6e3ad3f0e31b8e31c6c0769d0f474bcd9673e0e5.tar.bz2
i386: fix regression parsing multiboot initrd modules
The logic for parsing the multiboot initrd modules was messed up in commit 950c4e6c94b15cd0d8b63891dddd7a8dbf458e6a Author: Daniel P. Berrangé <berrange@redhat.com> Date: Mon Apr 16 12:17:43 2018 +0100 opts: don't silently truncate long option values Causing the length to be undercounter, and the number of modules over counted. It also passes NULL to get_opt_value() which was not robust at accepting a NULL value. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20180514171913.17664-2-berrange@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Tested-by: Roman Kagan <rkagan@virtuozzo.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'util/qemu-option.c')
-rw-r--r--util/qemu-option.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 19761e3..834217f 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -75,7 +75,9 @@ const char *get_opt_value(const char *p, char **value)
size_t capacity = 0, length;
const char *offset;
- *value = NULL;
+ if (value) {
+ *value = NULL;
+ }
while (1) {
offset = qemu_strchrnul(p, ',');
length = offset - p;