mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-22 13:15:12 +00:00
fix: unicode surrogate character in Python exception message. (#4297)
* Fix & test for issue #4288 (unicode surrogate character in Python exception message). * DRY `message_unavailable_exc` * fix: add a constexpr Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> * style: pre-commit fixes Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com> Co-authored-by: Aaron Gokaslan <skylion.aaron@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
parent
5bc0943ed9
commit
3a2c96bd6f
@ -501,11 +501,29 @@ struct error_fetch_and_normalize {
|
|||||||
std::string message_error_string;
|
std::string message_error_string;
|
||||||
if (m_value) {
|
if (m_value) {
|
||||||
auto value_str = reinterpret_steal<object>(PyObject_Str(m_value.ptr()));
|
auto value_str = reinterpret_steal<object>(PyObject_Str(m_value.ptr()));
|
||||||
|
constexpr const char *message_unavailable_exc
|
||||||
|
= "<MESSAGE UNAVAILABLE DUE TO ANOTHER EXCEPTION>";
|
||||||
if (!value_str) {
|
if (!value_str) {
|
||||||
message_error_string = detail::error_string();
|
message_error_string = detail::error_string();
|
||||||
result = "<MESSAGE UNAVAILABLE DUE TO ANOTHER EXCEPTION>";
|
result = message_unavailable_exc;
|
||||||
} else {
|
} else {
|
||||||
result = value_str.cast<std::string>();
|
// Not using `value_str.cast<std::string>()`, to not potentially throw a secondary
|
||||||
|
// error_already_set that will then result in process termination (#4288).
|
||||||
|
auto value_bytes = reinterpret_steal<object>(
|
||||||
|
PyUnicode_AsEncodedString(value_str.ptr(), "utf-8", "backslashreplace"));
|
||||||
|
if (!value_bytes) {
|
||||||
|
message_error_string = detail::error_string();
|
||||||
|
result = message_unavailable_exc;
|
||||||
|
} else {
|
||||||
|
char *buffer = nullptr;
|
||||||
|
Py_ssize_t length = 0;
|
||||||
|
if (PyBytes_AsStringAndSize(value_bytes.ptr(), &buffer, &length) == -1) {
|
||||||
|
message_error_string = detail::error_string();
|
||||||
|
result = message_unavailable_exc;
|
||||||
|
} else {
|
||||||
|
result = std::string(buffer, static_cast<std::size_t>(length));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
result = "<MESSAGE UNAVAILABLE>";
|
result = "<MESSAGE UNAVAILABLE>";
|
||||||
|
@ -105,11 +105,6 @@ struct PythonAlreadySetInDestructor {
|
|||||||
py::str s;
|
py::str s;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::string error_already_set_what(const py::object &exc_type, const py::object &exc_value) {
|
|
||||||
PyErr_SetObject(exc_type.ptr(), exc_value.ptr());
|
|
||||||
return py::error_already_set().what();
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_SUBMODULE(exceptions, m) {
|
TEST_SUBMODULE(exceptions, m) {
|
||||||
m.def("throw_std_exception",
|
m.def("throw_std_exception",
|
||||||
[]() { throw std::runtime_error("This exception was intentionally thrown."); });
|
[]() { throw std::runtime_error("This exception was intentionally thrown."); });
|
||||||
|
@ -275,6 +275,20 @@ def test_local_translator(msg):
|
|||||||
assert msg(excinfo.value) == "this mod"
|
assert msg(excinfo.value) == "this mod"
|
||||||
|
|
||||||
|
|
||||||
|
def test_error_already_set_message_with_unicode_surrogate(): # Issue #4288
|
||||||
|
assert m.error_already_set_what(RuntimeError, "\ud927") == (
|
||||||
|
"RuntimeError: \\ud927",
|
||||||
|
False,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_error_already_set_message_with_malformed_utf8():
|
||||||
|
assert m.error_already_set_what(RuntimeError, b"\x80") == (
|
||||||
|
"RuntimeError: b'\\x80'",
|
||||||
|
False,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class FlakyException(Exception):
|
class FlakyException(Exception):
|
||||||
def __init__(self, failure_point):
|
def __init__(self, failure_point):
|
||||||
if failure_point == "failure_point_init":
|
if failure_point == "failure_point_init":
|
||||||
|
Loading…
Reference in New Issue
Block a user