[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] json-parser: fix handling of large whole numb
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 06/11] json-parser: fix handling of large whole number values |
Date: |
Fri, 10 May 2013 17:46:05 -0500 |
Currently our JSON parser assumes that numbers lacking a fractional
value 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)
Fix this by detecting such cases and using a QFloat to store the value
instead.
Signed-off-by: Michael Roth <address@hidden>
---
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..e7947b3 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
+ * fractional part 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)));
--
1.7.9.5
- [Qemu-devel] [PATCH v3 00/11] qapi: add support for lists of native types, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 01/11] qapi: qapi-types.py, native list support, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 02/11] qapi: qapi-visit.py, fix list handling for union types, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 03/11] qapi: qapi-visit.py, native list support, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 04/11] qapi: enable generation of native list code, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 05/11] qapi: fix leak in unit tests, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 06/11] json-parser: fix handling of large whole number values,
Michael Roth <=
- [Qemu-devel] [PATCH 07/11] qapi: add QMP input test for large integers, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 08/11] qapi: fix visitor serialization tests for numbers/doubles, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 09/11] qapi: add native list coverage for visitor serialization tests, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 10/11] qapi: add native list coverage for QMP output visitor tests, Michael Roth, 2013/05/10
- [Qemu-devel] [PATCH 11/11] qapi: add native list coverage for QMP input visitor tests, Michael Roth, 2013/05/10
- Re: [Qemu-devel] [PATCH v3 00/11] qapi: add support for lists of native types, Laszlo Ersek, 2013/05/13
- Re: [Qemu-devel] [PATCH v3 00/11] qapi: add support for lists of native types, Amos Kong, 2013/05/13
- Re: [Qemu-devel] [PATCH v3 00/11] qapi: add support for lists of native types, Luiz Capitulino, 2013/05/15