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 segmentation faults when errors occur while handling unserialisable objects #531

Merged
merged 1 commit into from Apr 18, 2022
Merged

Fix segmentation faults when errors occur while handling unserialisable objects #531

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions python/objToJSON.c
View file
Open in desktop
Expand Up @@ -670,8 +670,15 @@ static void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc, JSONObject
PyErr_Clear();

objRepr = PyObject_Repr(obj);
PyObject* str = PyUnicode_AsEncodedString(objRepr, "utf-8", "~E~");
PyErr_Format (PyExc_TypeError, "%s is not JSON serializable", PyBytes_AsString(str));
if (!objRepr)
{
goto INVALID;
}
PyObject* str = PyUnicode_AsEncodedString(objRepr, "utf-8", "strict");
if (str)
{
PyErr_Format (PyExc_TypeError, "%s is not JSON serializable", PyBytes_AsString(str));
}
Py_XDECREF(str);
Py_DECREF(objRepr);

Expand Down
15 changes: 12 additions & 3 deletions tests/test_ujson.py
View file
Open in desktop
Expand Up @@ -636,22 +636,31 @@ def test_dumps(test_input, expected):


class SomeObject:
def __init__(self, message, exception=None):
self._message = message
self._exception = exception

def __repr__(self):
return "Some Object"
if self._exception:
raise self._exception
return self._message


@pytest.mark.parametrize(
"test_input, expected_exception, expected_message",
[
(set(), TypeError, "set() is not JSON serializable"),
({1, 2, 3}, TypeError, "{1, 2, 3} is not JSON serializable"),
(SomeObject(), TypeError, "Some Object is not JSON serializable"),
(SomeObject("Some Object"), TypeError, "Some Object is not JSON serializable"),
(SomeObject("\ud800"), UnicodeEncodeError, None),
(SomeObject(None, KeyboardInterrupt), KeyboardInterrupt, None),
],
)
def test_dumps_raises(test_input, expected_exception, expected_message):
with pytest.raises(expected_exception) as e:
ujson.dumps(test_input)
assert str(e.value) == expected_message
if expected_message:
assert str(e.value) == expected_message


@pytest.mark.parametrize(
Expand Down