[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-4.0 3/9] qapi: Fix string-input-visitor to re
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v3 for-4.0 3/9] qapi: Fix string-input-visitor to reject NaN and infinities |
Date: |
Wed, 21 Nov 2018 17:44:15 +0100 |
The string-input-visitor happily accepts NaN and infinities when parsing
numbers (doubles). They shouldn't. Fix that.
Also, add two test cases, testing if "NaN" and "inf" is properly
rejected.
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
qapi/string-input-visitor.c | 6 ++----
tests/test-string-input-visitor.c | 13 +++++++++++++
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index b3fdd0827d..b89c6c4e06 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -20,6 +20,7 @@
#include "qemu/option.h"
#include "qemu/queue.h"
#include "qemu/range.h"
+#include "qemu/cutils.h"
struct StringInputVisitor
@@ -313,12 +314,9 @@ static void parse_type_number(Visitor *v, const char
*name, double *obj,
Error **errp)
{
StringInputVisitor *siv = to_siv(v);
- char *endp = (char *) siv->string;
double val;
- errno = 0;
- val = strtod(siv->string, &endp);
- if (errno || endp == siv->string || *endp) {
+ if (qemu_strtod_finite(siv->string, NULL, &val)) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"number");
return;
diff --git a/tests/test-string-input-visitor.c
b/tests/test-string-input-visitor.c
index 88e0e1aa9a..1efba06948 100644
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -252,6 +252,19 @@ static void test_visitor_in_number(TestInputVisitorData
*data,
visit_type_number(v, NULL, &res, &err);
g_assert(!err);
g_assert_cmpfloat(res, ==, value);
+
+ /* NaN and infinity has to be rejected */
+
+ v = visitor_input_test_init(data, "NaN");
+
+ visit_type_number(v, NULL, &res, &err);
+ error_free_or_abort(&err);
+
+ v = visitor_input_test_init(data, "inf");
+
+ visit_type_number(v, NULL, &res, &err);
+ error_free_or_abort(&err);
+
}
static void test_visitor_in_string(TestInputVisitorData *data,
--
2.17.2
- [Qemu-devel] [PATCH v3 for-4.0 0/9] qapi: Rewrite string-input-visitor's integer and list parsing, David Hildenbrand, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 1/9] cutils: Add qemu_strtod() and qemu_strtod_finite(), David Hildenbrand, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 2/9] cutils: Fix qemu_strtosz() & friends to reject non-finite sizes, David Hildenbrand, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 3/9] qapi: Fix string-input-visitor to reject NaN and infinities,
David Hildenbrand <=
- [Qemu-devel] [PATCH v3 for-4.0 4/9] qapi: Use qemu_strtod_finite() in qobject-input-visitor, David Hildenbrand, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 5/9] test-string-input-visitor: Add more tests, David Hildenbrand, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 7/9] test-string-input-visitor: Use virtual walk, David Hildenbrand, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 6/9] qapi: Rewrite string-input-visitor's integer and list parsing, David Hildenbrand, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 8/9] test-string-input-visitor: Split off uint64 list tests, David Hildenbrand, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 9/9] test-string-input-visitor: Add range overflow tests, David Hildenbrand, 2018/11/21
- Re: [Qemu-devel] [PATCH v3 for-4.0 0/9] qapi: Rewrite string-input-visitor's integer and list parsing, Markus Armbruster, 2018/11/26