[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/24] option: Fix to reject invalid and overflowing
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 09/24] option: Fix to reject invalid and overflowing numbers |
Date: |
Thu, 23 Feb 2017 20:53:47 +0100 |
parse_option_number() fails to check for these errors after
strtoull(). Has always been broken. Fix that.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
tests/test-qemu-opts.c | 19 ++++++++-----------
util/qemu-option.c | 11 ++++++++---
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index 310485b..8b92f7b 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -603,17 +603,15 @@ static void test_opts_parse_number(void)
/* Above upper limit */
opts = qemu_opts_parse(&opts_list_01, "number1=18446744073709551616",
- false, &error_abort);
- /* BUG: should reject */
- g_assert_cmpuint(opts_count(opts), ==, 1);
- g_assert_cmpuint(qemu_opt_get_number(opts, "number1", 1), ==, UINT64_MAX);
+ false, &err);
+ error_free_or_abort(&err);
+ g_assert(!opts);
/* Below lower limit */
opts = qemu_opts_parse(&opts_list_01, "number1=-18446744073709551616",
- false, &error_abort);
- /* BUG: should reject */
- g_assert_cmpuint(opts_count(opts), ==, 1);
- g_assert_cmpuint(qemu_opt_get_number(opts, "number1", 1), ==, UINT64_MAX);
+ false, &err);
+ error_free_or_abort(&err);
+ g_assert(!opts);
/* Hex and octal */
opts = qemu_opts_parse(&opts_list_01, "number1=0x2a,number2=052",
@@ -624,9 +622,8 @@ static void test_opts_parse_number(void)
/* Invalid */
opts = qemu_opts_parse(&opts_list_01, "number1=", false, &err);
- /* BUG: should reject */
- g_assert_cmpuint(opts_count(opts), ==, 1);
- g_assert_cmpuint(qemu_opt_get_number(opts, "number1", 1), ==, 0);
+ error_free_or_abort(&err);
+ g_assert(!opts);
opts = qemu_opts_parse(&opts_list_01, "number1=eins", false, &err);
error_free_or_abort(&err);
g_assert(!opts);
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 9708668..273d00d 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -141,11 +141,16 @@ static void parse_option_bool(const char *name, const
char *value, bool *ret,
static void parse_option_number(const char *name, const char *value,
uint64_t *ret, Error **errp)
{
- char *postfix;
uint64_t number;
+ int err;
- number = strtoull(value, &postfix, 0);
- if (*postfix != '\0') {
+ err = qemu_strtou64(value, NULL, 0, &number);
+ if (err == -ERANGE) {
+ error_setg(errp, "Value '%s' is too large for parameter '%s'",
+ value, name);
+ return;
+ }
+ if (err) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name, "a number");
return;
}
--
2.7.4
- [Qemu-devel] [PULL 00/24] option cutils: Fix and clean up number conversions, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 10/24] test-cutils: Add missing qemu_strtosz()... endptr checks, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 11/24] test-cutils: Cover qemu_strtosz() invalid input, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 19/24] test-cutils: Drop suffix from test_qemu_strtosz_simple(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 12/24] test-cutils: Cover qemu_strtosz() with trailing crap, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 03/24] test-cutils: Add missing qemu_strtol()... endptr checks, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 09/24] option: Fix to reject invalid and overflowing numbers,
Markus Armbruster <=
- [Qemu-devel] [PULL 02/24] option: Assert value string isn't null, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 14/24] util/cutils: New qemu_strtosz_metric(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 13/24] test-cutils: Cover qemu_strtosz() around range limits, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 24/24] option: Fix checking of sizes for overflow and trailing crap, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 06/24] util/cutils: Rename qemu_strtoll(), qemu_strtoull(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 07/24] util/cutils: Clean up variable names around qemu_strtol(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 08/24] util/cutils: Clean up control flow around qemu_strtol() a bit, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 21/24] util/cutils: Let qemu_strtosz*() optionally reject trailing crap, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 15/24] util/cutils: Rename qemu_strtosz() to qemu_strtosz_MiB(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PULL 17/24] util/cutils: Drop QEMU_STRTOSZ_DEFSUFFIX_* macros, Markus Armbruster, 2017/02/23