mirror/ultrajson
1
0
Fork 0
mirror of https://github.com/ultrajson/ultrajson.git synced 2024-12-04 06:38:23 +01:00
Code Issues

Fix errors on reading long decimal floats

Browse Source
This commit is contained in:
David W.H. Swenson 2020-11-11 14:51:27 +01:00
parent f26f9679f1
commit b773bf05dc
No known key found for this signature in database
GPG Key ID: D573FDAB784AA195
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/ultrajsondec.c
View File

@ -90,6 +90,7 @@ static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodeDouble(struct DecoderState *ds)
static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds)
{
int intNeg = 1;
int hasError = 0;
JSUINT64 intValue;
JSUINT64 prevIntValue;
int chr;
@ -130,11 +131,11 @@ static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds
if (intNeg == 1 && prevIntValue > intValue)
{
return SetError(ds, -1, "Value is too big!");
hasError = 1;
}
else if (intNeg == -1 && intValue > overflowLimit)
{
return SetError(ds, -1, overflowLimit == LLONG_MAX ? "Value is too big!" : "Value is too small");
hasError = 1;
}
offset ++;
@ -154,6 +155,17 @@ static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds
default:
{
if (hasError)
{
if (intNeg == 1)
{
return SetError(ds, -1, "Value is too big!");
}
else if (intNeg == -1)
{
return SetError(ds, -1, overflowLimit == LLONG_MAX ? "Value is too big!" : "Value is too small");
}
}
goto BREAK_INT_LOOP;
break;
}

4
tests/test_ujson.py
View File

@ -533,6 +533,10 @@ def test_decode_numeric_int_exp(test_input):
assert output == json.loads(test_input)
def test_decode_long_float():
assert ujson.decode("100000000000000000000.0") == 1e20
@pytest.mark.parametrize(
"test_input, expected",
[