From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: Markus Armbruster <armbru@redhat.com>,
Michael Roth <mdroth@linux.vnet.ibm.com>,
Eric Blake <eblake@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
David Hildenbrand <david@redhat.com>
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 [thread overview]
Message-ID: <20181121164421.20780-5-david@redhat.com> (raw)
In-Reply-To: <20181121164421.20780-1-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>
---
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-11-21 16:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 16:44 [Qemu-devel] [PATCH v3 for-4.0 0/9] qapi: Rewrite string-input-visitor's integer and list parsing David Hildenbrand
2018-11-21 16:44 ` [Qemu-devel] [PATCH v3 for-4.0 1/9] cutils: Add qemu_strtod() and qemu_strtod_finite() David Hildenbrand
2018-11-21 17:43 ` Eric Blake
2018-11-21 16:44 ` [Qemu-devel] [PATCH v3 for-4.0 2/9] cutils: Fix qemu_strtosz() & friends to reject non-finite sizes David Hildenbrand
2018-11-21 16:44 ` [Qemu-devel] [PATCH v3 for-4.0 3/9] qapi: Fix string-input-visitor to reject NaN and infinities David Hildenbrand
2018-11-21 16:44 ` David Hildenbrand [this message]
2018-11-21 16:44 ` [Qemu-devel] [PATCH v3 for-4.0 5/9] test-string-input-visitor: Add more tests David Hildenbrand
2018-11-21 16:44 ` [Qemu-devel] [PATCH v3 for-4.0 6/9] qapi: Rewrite string-input-visitor's integer and list parsing David Hildenbrand
2018-11-21 16:44 ` [Qemu-devel] [PATCH v3 for-4.0 7/9] test-string-input-visitor: Use virtual walk David Hildenbrand
2018-11-21 16:44 ` [Qemu-devel] [PATCH v3 for-4.0 8/9] test-string-input-visitor: Split off uint64 list tests David Hildenbrand
2018-11-21 16:44 ` [Qemu-devel] [PATCH v3 for-4.0 9/9] test-string-input-visitor: Add range overflow tests David Hildenbrand
2018-11-26 17:33 ` [Qemu-devel] [PATCH v3 for-4.0 0/9] qapi: Rewrite string-input-visitor's integer and list parsing 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=20181121164421.20780-5-david@redhat.com \
--to=david@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=pbonzini@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).