Skip to content

Validate number_mode in load and Decoder #244

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

Merged
lelit merged 1 commit into from
Oct 12, 2026
Merged

Validate number_mode in load and Decoder #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 12 additions & 38 deletions rapidjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1769,28 +1769,12 @@ load(PyObject* self, PyObject* args, PyObject* kwargs)
}
}

if (numberModeObj) {
if (numberModeObj == Py_None) {
numberMode = NM_NONE;
} else if (PyLong_Check(numberModeObj)) {
int mode = PyLong_AsLong(numberModeObj);
if (mode < 0 || mode >= NM_MAX) {
PyErr_SetString(PyExc_ValueError, "Invalid number_mode");
return NULL;
}
numberMode = (unsigned) mode;
if (numberMode & NM_DECIMAL && numberMode & NM_NATIVE) {
PyErr_SetString(PyExc_ValueError,
"Combining NM_NATIVE with NM_DECIMAL is not supported");
return NULL;
}
}
}
if (allowNan != -1) {
if (allowNan)
numberMode |= NM_NAN;
else
numberMode &= ~NM_NAN;
if (!accept_number_mode_arg(numberModeObj, allowNan, numberMode))
return NULL;
if (numberMode & NM_DECIMAL && numberMode & NM_NATIVE) {
PyErr_SetString(PyExc_ValueError,
"Combining NM_NATIVE with NM_DECIMAL is not supported");
return NULL;
}

if (datetimeModeObj) {
Expand Down Expand Up @@ -2209,22 +2193,12 @@ decoder_new(PyTypeObject* type, PyObject* args, PyObject* kwargs)
&parseModeObj))
return NULL;

if (numberModeObj) {
if (numberModeObj == Py_None) {
numberMode = NM_NONE;
} else if (PyLong_Check(numberModeObj)) {
int mode = PyLong_AsLong(numberModeObj);
if (mode < 0 || mode >= NM_MAX) {
PyErr_SetString(PyExc_ValueError, "Invalid number_mode");
return NULL;
}
numberMode = (unsigned) mode;
if (numberMode & NM_DECIMAL && numberMode & NM_NATIVE) {
PyErr_SetString(PyExc_ValueError,
"Combining NM_NATIVE with NM_DECIMAL is not supported");
return NULL;
}
}
if (!accept_number_mode_arg(numberModeObj, -1, numberMode))
return NULL;
if (numberMode & NM_DECIMAL && numberMode & NM_NATIVE) {
PyErr_SetString(PyExc_ValueError,
"Combining NM_NATIVE with NM_DECIMAL is not supported");
return NULL;
}

if (datetimeModeObj) {
Expand Down
52 changes: 52 additions & 0 deletions tests/test_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,58 @@ def test_invalid_loads_params(posargs, kwargs, loads):
assert False, "Expected either a TypeError or a ValueError"


@pytest.mark.parametrize('number_mode,error', (
(1.0, TypeError),
('0', TypeError),
([], TypeError),
({}, TypeError),
(object(), TypeError),
(-1, ValueError),
(8, ValueError),
(2**32, ValueError),
(2**32 + 1, ValueError),
(-(2**32), ValueError),
(2**64, ValueError),
(2**64 + 1, ValueError),
(-(2**64), ValueError),
(rj.NM_NATIVE | rj.NM_DECIMAL, ValueError),
(rj.NM_NATIVE | rj.NM_DECIMAL | rj.NM_NAN, ValueError),
))
def test_invalid_number_mode(number_mode, error, loads):
with pytest.raises(error) as exc:
loads('[1.25]', number_mode=number_mode)
assert type(exc.value) is error


def test_invalid_number_mode_index_object(loads):
class IndexMode:
def __index__(self):
return rj.NM_NONE

with pytest.raises(TypeError):
loads('[1.25]', number_mode=IndexMode())


@pytest.mark.parametrize('number_mode,error', ((1.0, TypeError), (2**32, ValueError)))
def test_invalid_number_mode_decoder_constructor(number_mode, error):
with pytest.raises(error) as exc:
rj.Decoder(number_mode=number_mode)
assert type(exc.value) is error


@pytest.mark.parametrize('stream_type,document', (
(io.StringIO, '[1.25]'), (io.BytesIO, b'[1.25]'),
))
@pytest.mark.parametrize('number_mode,error', ((1.0, TypeError), (2**32, ValueError)))
def test_invalid_number_mode_preserves_stream(stream_type, document, number_mode, error):
stream = stream_type(document)
with pytest.raises(error) as exc:
rj.load(stream, number_mode=number_mode)
assert type(exc.value) is error
assert stream.tell() == 0
assert not stream.closed


@pytest.mark.parametrize(
'posargs,kwargs', (
( (), {} ),
Expand Down
Loading