|
 |
9ae3a8 |
From 2263af4c1921520ddc9177c13a176860c0069fab Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <2263af4c1921520ddc9177c13a176860c0069fab.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 10 Dec 2013 15:29:04 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 04/21] json-parser: fix handling of large whole number values
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1386689361-30281-2-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56120
|
|
|
9ae3a8 |
O-Subject: [PATCH 7.0 qemu-kvm 01/18] json-parser: fix handling of large whole number values
|
|
|
9ae3a8 |
Bugzilla: 997915
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Currently our JSON parser assumes that numbers lacking a fractional
|
|
|
9ae3a8 |
value are integers and attempts to store them as QInt/int64 values. This
|
|
|
9ae3a8 |
breaks in the case where the number overflows/underflows int64 values (which
|
|
|
9ae3a8 |
is still valid JSON)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Fix this by detecting such cases and using a QFloat to store the value
|
|
|
9ae3a8 |
instead.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 3d5b3ec6d460a92245215aaf7b349b0b9e5ffa25)
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qobject/json-parser.c | 26 +++++++++++++++++++++++---
|
|
|
9ae3a8 |
1 file changed, 23 insertions(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qobject/json-parser.c | 26 +++++++++++++++++++++++---
|
|
|
9ae3a8 |
1 file changed, 23 insertions(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qobject/json-parser.c b/qobject/json-parser.c
|
|
|
9ae3a8 |
index 05279c1..e7947b3 100644
|
|
|
9ae3a8 |
--- a/qobject/json-parser.c
|
|
|
9ae3a8 |
+++ b/qobject/json-parser.c
|
|
|
9ae3a8 |
@@ -640,9 +640,29 @@ static QObject *parse_literal(JSONParserContext *ctxt)
|
|
|
9ae3a8 |
case JSON_STRING:
|
|
|
9ae3a8 |
obj = QOBJECT(qstring_from_escaped_str(ctxt, token));
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
- case JSON_INTEGER:
|
|
|
9ae3a8 |
- obj = QOBJECT(qint_from_int(strtoll(token_get_value(token), NULL, 10)));
|
|
|
9ae3a8 |
- break;
|
|
|
9ae3a8 |
+ case JSON_INTEGER: {
|
|
|
9ae3a8 |
+ /* A possibility exists that this is a whole-valued float where the
|
|
|
9ae3a8 |
+ * fractional part was left out due to being 0 (.0). It's not a big
|
|
|
9ae3a8 |
+ * deal to treat these as ints in the parser, so long as users of the
|
|
|
9ae3a8 |
+ * resulting QObject know to expect a QInt in place of a QFloat in
|
|
|
9ae3a8 |
+ * cases like these.
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * However, in some cases these values will overflow/underflow a
|
|
|
9ae3a8 |
+ * QInt/int64 container, thus we should assume these are to be handled
|
|
|
9ae3a8 |
+ * as QFloats/doubles rather than silently changing their values.
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * strtoll() indicates these instances by setting errno to ERANGE
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+ int64_t value;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ errno = 0; /* strtoll doesn't set errno on success */
|
|
|
9ae3a8 |
+ value = strtoll(token_get_value(token), NULL, 10);
|
|
|
9ae3a8 |
+ if (errno != ERANGE) {
|
|
|
9ae3a8 |
+ obj = QOBJECT(qint_from_int(value));
|
|
|
9ae3a8 |
+ break;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ /* fall through to JSON_FLOAT */
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
case JSON_FLOAT:
|
|
|
9ae3a8 |
/* FIXME dependent on locale */
|
|
|
9ae3a8 |
obj = QOBJECT(qfloat_from_double(strtod(token_get_value(token), NULL)));
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|