From: Luiz Capitulino <lcapitulino@redhat.com>
To: Michael Roth <mdroth@linux.vnet.ibm.com>
Cc: akong@redhat.com, lersek@redhat.com, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 06/10] json-parser: fix handling of large whole number values
Date: Fri, 10 May 2013 11:17:17 -0400 [thread overview]
Message-ID: <20130510111717.4a9449a9@redhat.com> (raw)
In-Reply-To: <1368152462-13219-7-git-send-email-mdroth@linux.vnet.ibm.com>
On Thu, 9 May 2013 21:20:58 -0500
Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> Currently our JSON parser assumes that numbers lacking a mantissa are
> integers and attempts to store them as QInt/int64 values. This breaks in
> the case where the number overflows/underflows int64 values (which is
> still valid JSON)
Anthony wanted to fix this by moving to another wire format :)
But, how this patch related to this series?
>
> Fix this by detecting such cases and using a QFloat to store the value
> instead.
>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
> qobject/json-parser.c | 26 +++++++++++++++++++++++---
> 1 file changed, 23 insertions(+), 3 deletions(-)
>
> diff --git a/qobject/json-parser.c b/qobject/json-parser.c
> index 05279c1..4d14e71 100644
> --- a/qobject/json-parser.c
> +++ b/qobject/json-parser.c
> @@ -640,9 +640,29 @@ static QObject *parse_literal(JSONParserContext *ctxt)
> case JSON_STRING:
> obj = QOBJECT(qstring_from_escaped_str(ctxt, token));
> break;
> - case JSON_INTEGER:
> - obj = QOBJECT(qint_from_int(strtoll(token_get_value(token), NULL, 10)));
> - break;
> + case JSON_INTEGER: {
> + /* A possibility exists that this is a whole-valued float where the
> + * mantissa was left out due to being 0 (.0). It's not a big deal to
> + * treat these as ints in the parser, so long as users of the
> + * resulting QObject know to expect a QInt in place of a QFloat in
> + * cases like these.
> + *
> + * However, in some cases these values will overflow/underflow a
> + * QInt/int64 container, thus we should assume these are to be handled
> + * as QFloats/doubles rather than silently changing their values.
> + *
> + * strtoll() indicates these instances by setting errno to ERANGE
> + */
> + int64_t value;
> +
> + errno = 0; /* strtoll doesn't set errno on success */
> + value = strtoll(token_get_value(token), NULL, 10);
> + if (errno != ERANGE) {
> + obj = QOBJECT(qint_from_int(value));
> + break;
> + }
> + /* fall through to JSON_FLOAT */
> + }
> case JSON_FLOAT:
> /* FIXME dependent on locale */
> obj = QOBJECT(qfloat_from_double(strtod(token_get_value(token), NULL)));
next prev parent reply other threads:[~2013-05-10 15:18 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-10 2:20 [Qemu-devel] [PATCH v2 00/10] qapi: add support for lists of native types Michael Roth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 01/10] qapi: qapi-types.py, native list support Michael Roth
2013-05-10 3:04 ` Amos Kong
2013-05-10 11:32 ` mdroth
2013-05-10 14:07 ` Luiz Capitulino
2013-05-10 15:51 ` mdroth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 02/10] qapi: qapi-visit.py, fix list handling for union types Michael Roth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 03/10] qapi: qapi-visit.py, native list support Michael Roth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 04/10] qapi: enable generation of native list code Michael Roth
2013-05-10 14:10 ` Luiz Capitulino
2013-05-10 16:32 ` mdroth
2013-05-10 22:28 ` mdroth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 05/10] qapi: fix leak in unit tests Michael Roth
2013-05-10 15:14 ` Luiz Capitulino
2013-05-10 2:20 ` [Qemu-devel] [PATCH 06/10] json-parser: fix handling of large whole number values Michael Roth
2013-05-10 11:55 ` Laszlo Ersek
2013-05-10 12:22 ` Eric Blake
2013-05-10 12:47 ` Laszlo Ersek
2013-05-10 13:30 ` mdroth
2013-05-10 14:08 ` Eric Blake
2013-05-10 14:51 ` mdroth
2013-05-10 15:17 ` Luiz Capitulino [this message]
2013-05-10 16:00 ` mdroth
2013-05-10 2:20 ` [Qemu-devel] [PATCH 07/10] qapi: fix visitor serialization tests for numbers/doubles Michael Roth
2013-05-10 2:21 ` [Qemu-devel] [PATCH 08/10] qapi: add native list coverage for visitor serialization tests Michael Roth
2013-05-10 2:21 ` [Qemu-devel] [PATCH 09/10] qapi: add native list coverage for QMP output visitor tests Michael Roth
2013-05-10 2:21 ` [Qemu-devel] [PATCH 10/10] qapi: add native list coverage for QMP input " Michael Roth
2013-05-10 15:30 ` [Qemu-devel] [PATCH v2 00/10] qapi: add support for lists of native types Luiz Capitulino
2013-05-10 15:40 ` Laszlo Ersek
2013-05-10 15:43 ` Luiz Capitulino
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=20130510111717.4a9449a9@redhat.com \
--to=lcapitulino@redhat.com \
--cc=akong@redhat.com \
--cc=lersek@redhat.com \
--cc=mdroth@linux.vnet.ibm.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).