[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/12] json-parser: fix handling of large whole numbe
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 05/12] json-parser: fix handling of large whole number values |
Date: |
Thu, 23 May 2013 14:20:25 -0400 |
From: Michael Roth <address@hidden>
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>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Amos Kong <address@hidden>
Signed-off-by: Luiz Capitulino <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.8.1.4
- [Qemu-devel] [PULL 00/12] QMP queue, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 01/12] qapi: qapi-types.py, native list support, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 02/12] qapi: qapi-visit.py, fix list handling for union types, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 03/12] qapi: qapi-visit.py, native list support, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 05/12] json-parser: fix handling of large whole number values,
Luiz Capitulino <=
- [Qemu-devel] [PULL 06/12] qapi: add QMP input test for large integers, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 04/12] qapi: enable generation of native list code, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 07/12] qapi: fix visitor serialization tests for numbers/doubles, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 12/12] monitor: allow to disable the default monitor, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 08/12] qapi: add native list coverage for visitor serialization tests, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 11/12] ui/input.c: replace magic numbers with macros, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 10/12] qapi: add native list coverage for QMP input visitor tests, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 09/12] qapi: add native list coverage for QMP output visitor tests, Luiz Capitulino, 2013/05/23