Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix len integer overflow issue #567

Merged
merged 6 commits into from
Oct 14, 2022
Merged

Fix len integer overflow issue #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb96b90
Fix len integer overflow issue
Oct 4, 2022
6f6e69c
Added unittest where int overflow causes exception
Oct 11, 2022
2013758
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 11, 2022
4d82888
Fix flake8
Oct 11, 2022
1161d5d
Add checks to test suite and improve comments
Oct 14, 2022
ec095e4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/ultrajsondec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ static JSOBJ SetError( struct DecoderState *ds, int offset, const char *message)
static FASTCALL_ATTR JSOBJ FASTCALL_MSVC decodeDouble(struct DecoderState *ds)
{
int processed_characters_count;
int len = (int)(ds->end - ds->start);
/* Prevent int overflow if ds->end - ds->start is too large. See check_decode_decimal_no_int_overflow()
inside tests/test_ujson.py for an example where this check is necessary. */
int len = ((size_t) (ds->end - ds->start) < (size_t) INT_MAX) ? (int) (ds->end - ds->start) : INT_MAX;
double value = dconv_s2d(ds->dec->s2d, ds->start, len, &processed_characters_count);
ds->lastType = JT_DOUBLE;
ds->start += processed_characters_count;
Expand Down
13 changes: 13 additions & 0 deletions tests/test_ujson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,19 @@ def test_separators_errors(separators, expected_exception):
ujson.dumps({"a": 0, "b": 1}, separators=separators)


"""
The following checks are not part of the standard test suite.
They can be run manually as follows:
python -c 'from tests.test_ujson import check_foo; check_foo()'
"""


def check_decode_decimal_no_int_overflow():
# Requires enough free RAM to hold a ~4GB string in memory
decoded = ujson.decode(r'[0.123456789,"{}"]'.format("a" * (2**32 - 5)))
assert decoded[0] == 0.123456789


"""
def test_decode_numeric_int_frc_overflow():
input = "X.Y"
Expand Down