Skip to content

Fix loads exception handling. Don't assume exception class can accept… #82

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
Sep 30, 2017
Merged

Fix loads exception handling. Don't assume exception class can accept… #82

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
7 changes: 7 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changes
-------

Unreleased
~~~~~~~~~~

* Fix bug where error handling code could raise an exception causing a
confusing exception to be returned.


0.2.4 (2017-09-17)
~~~~~~~~~~~~~~~~~~

Expand Down
11 changes: 8 additions & 3 deletions rapidjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,11 +1278,16 @@ do_decode(PyObject* decoder, const char* jsonStr, Py_ssize_t jsonStrLen,
PyObject* etraceback;
PyErr_Fetch(&etype, &evalue, &etraceback);

// Try to add the offset in the error message if the exception
// value is a string. Otherwise, use the original exception since
// we can't be sure the exception type takes a single string.
const char* emsg = msg;
if (PyUnicode_Check(evalue))
if (PyUnicode_Check(evalue)) {
emsg = PyUnicode_AsUTF8(evalue);

PyErr_Format(etype, fmt, offset, emsg);
PyErr_Format(etype, fmt, offset, emsg);
}
else
PyErr_Restore(etype, evalue, etraceback);
}
else
PyErr_Format(PyExc_ValueError, fmt, offset, msg);
Expand Down
10 changes: 10 additions & 0 deletions tests/test_unicode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,13 @@ def test_dump_surrogate(o, dumps):
def test_load_surrogate(j, loads):
with pytest.raises(ValueError, match="surrogate pair in string is invalid"):
loads(j)


@pytest.mark.unit
@pytest.mark.parametrize('j', [
'"\\udc00"',
'"\\udfff"',
])
def test_unicode_decode_error(j, loads):
with pytest.raises(UnicodeDecodeError, match="'utf-8' codec can't decode byte"):
loads(j)