[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-4.0 4/9] qapi: Use qemu_strtod_finite() in qo
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v3 for-4.0 4/9] qapi: Use qemu_strtod_finite() in qobject-input-visitor |
Date: |
Wed, 21 Nov 2018 17:44:16 +0100 |
Let's use the new function. Just as current behavior, we have to
consume the whole string (now it's just way clearer what's going on).
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
qapi/qobject-input-visitor.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 3e88b27f9e..07465f9947 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -562,19 +562,20 @@ static void qobject_input_type_number_keyval(Visitor *v,
const char *name,
{
QObjectInputVisitor *qiv = to_qiv(v);
const char *str = qobject_input_get_keyval(qiv, name, errp);
- char *endp;
+ double val;
if (!str) {
return;
}
- errno = 0;
- *obj = strtod(str, &endp);
- if (errno || endp == str || *endp || !isfinite(*obj)) {
+ if (qemu_strtod_finite(str, NULL, &val)) {
/* TODO report -ERANGE more nicely */
error_setg(errp, QERR_INVALID_PARAMETER_TYPE,
full_name(qiv, name), "number");
+ return;
}
+
+ *obj = val;
}
static void qobject_input_type_any(Visitor *v, const char *name, QObject **obj,
--
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, 2018/11/21
- [Qemu-devel] [PATCH v3 for-4.0 4/9] qapi: Use qemu_strtod_finite() in qobject-input-visitor,
David Hildenbrand <=
- [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