motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 06:21:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

json-parser: fix handling of large whole number values

Browse source 
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 <mdroth@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Amos Kong <akong@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Michael Roth 2013-05-10 17:46:05 -05:00 • committed by Luiz Capitulino
parent 0b400e7927
commit 3d5b3ec6d4
1 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
qobject/json-parser.c
View file

@ -640,9 +640,29 @@ static QObject *parse_literal(JSONParserContext *ctxt)
case JSON_STRING: case JSON_STRING:
obj = QOBJECT(qstring_from_escaped_str(ctxt, token)); obj = QOBJECT(qstring_from_escaped_str(ctxt, token));
break; break;
case JSON_INTEGER: case JSON_INTEGER: {
obj = QOBJECT(qint_from_int(strtoll(token_get_value(token), NULL, 10))); /* A possibility exists that this is a whole-valued float where the
break; * 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: case JSON_FLOAT:
/* FIXME dependent on locale */ /* FIXME dependent on locale */
obj = QOBJECT(qfloat_from_double(strtod(token_get_value(token), NULL))); obj = QOBJECT(qfloat_from_double(strtod(token_get_value(token), NULL)));