From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: David Hildenbrand <david@redhat.com>
Subject: [Qemu-devel] [PULL 04/32] qapi: Use qemu_strtod_finite() in qobject-input-visitor
Date: Thu, 13 Dec 2018 19:43:12 +0100 [thread overview]
Message-ID: <20181213184340.24037-5-armbru@redhat.com> (raw)
In-Reply-To: <20181213184340.24037-1-armbru@redhat.com>
From: David Hildenbrand <david@redhat.com>
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 <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20181121164421.20780-5-david@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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
next prev parent reply other threads:[~2018-12-13 18:43 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 18:43 [Qemu-devel] [PULL 00/32] QAPI patches for 2018-12-13 Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 01/32] cutils: Add qemu_strtod() and qemu_strtod_finite() Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 02/32] cutils: Fix qemu_strtosz() & friends to reject non-finite sizes Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 03/32] qapi: Fix string-input-visitor to reject NaN and infinities Markus Armbruster
2018-12-13 18:43 ` Markus Armbruster [this message]
2018-12-13 18:43 ` [Qemu-devel] [PULL 05/32] test-string-input-visitor: Add more tests Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 06/32] qapi: Rewrite string-input-visitor's integer and list parsing Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 07/32] test-string-input-visitor: Use virtual walk Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 08/32] test-string-input-visitor: Split off uint64 list tests Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 09/32] test-string-input-visitor: Add range overflow tests Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 10/32] docs: Update references to JSON RFC Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 11/32] json: Fix to reject duplicate object member names Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 12/32] tests/qapi: Cover commands with 'if' and union / alternate 'data' Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 13/32] qapi: rename QAPISchemaEnumType.values to .members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 14/32] qapi: break long lines at 'data' member Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 15/32] qapi: Do not define enumeration value explicitly Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 16/32] qapi: change enum visitor and gen_enum* to take QAPISchemaMember Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 17/32] tests: print enum type members more like object type members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 18/32] qapi: factor out checking for keys Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 19/32] qapi: improve reporting of unknown or missing keys Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 20/32] qapi: add a dictionary form with 'name' key for enum members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 21/32] qapi: add 'if' to " Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 22/32] qapi-events: add 'if' condition to implicit event enum Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 23/32] qapi: add a dictionary form for TYPE Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 24/32] qapi: Add 'if' to implicit struct members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 25/32] qapi: add 'if' to union members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 26/32] qapi: add 'if' to alternate members Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 27/32] qapi: add #if conditions to generated code members Markus Armbruster
2018-12-13 21:52 ` Eric Blake
2018-12-14 6:06 ` Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 28/32] qapi: add 'If:' condition to enum values documentation Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 29/32] qapi: add 'If:' condition to struct members documentation Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 30/32] qapi: add condition to variants documentation Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 31/32] qapi: add more conditions to SPICE Markus Armbruster
2018-12-13 18:43 ` [Qemu-devel] [PULL 32/32] qapi: add conditions to REPLICATION type/commands on the schema Markus Armbruster
2018-12-17 16:00 ` Thomas Huth
2018-12-17 18:38 ` Marc-André Lureau
2018-12-18 7:03 ` Markus Armbruster
2018-12-17 19:18 ` Markus Armbruster
2018-12-18 8:27 ` [Qemu-devel] Regression test with --disable options (was: qapi: add conditions to REPLICATION type/commands on the schema) Thomas Huth
2018-12-18 10:08 ` [Qemu-devel] Regression test with --disable options Markus Armbruster
2018-12-14 5:35 ` [Qemu-devel] [PULL 00/32] QAPI patches for 2018-12-13 Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181213184340.24037-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).