From 6e3ad3f0e31b8e31c6c0769d0f474bcd9673e0e5 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Mon, 14 May 2018 18:19:11 +0100 Subject: 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é 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é Message-Id: <20180514171913.17664-2-berrange@redhat.com> Reviewed-by: Eduardo Habkost Tested-by: Roman Kagan Signed-off-by: Paolo Bonzini --- util/qemu-option.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'util/qemu-option.c') diff --git a/util/qemu-option.c b/util/qemu-option.c index 19761e3eaf..834217fc75 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; -- cgit v1.2.3-55-g7522 From 0c2f6e7ee99517449b4ed6cf333c2d9456d8fe35 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Mon, 14 May 2018 18:19:13 +0100 Subject: opts: remove redundant check for NULL parameter No callers of get_opt_value() pass in a NULL for the "value" parameter, so the check is redundant. Signed-off-by: Daniel P. Berrangé Message-Id: <20180514171913.17664-4-berrange@redhat.com> Reviewed-by: Eduardo Habkost Tested-by: Roman Kagan Signed-off-by: Paolo Bonzini --- util/qemu-option.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'util/qemu-option.c') diff --git a/util/qemu-option.c b/util/qemu-option.c index 834217fc75..01886efe90 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -75,20 +75,16 @@ const char *get_opt_value(const char *p, char **value) size_t capacity = 0, length; const char *offset; - if (value) { - *value = NULL; - } + *value = NULL; while (1) { offset = qemu_strchrnul(p, ','); length = offset - p; if (*offset != '\0' && *(offset + 1) == ',') { length++; } - if (value) { - *value = g_renew(char, *value, capacity + length + 1); - strncpy(*value + capacity, p, length); - (*value)[capacity + length] = '\0'; - } + *value = g_renew(char, *value, capacity + length + 1); + strncpy(*value + capacity, p, length); + (*value)[capacity + length] = '\0'; capacity += length; if (*offset == '\0' || *(offset + 1) != ',') { -- cgit v1.2.3-55-g7522