Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-02-21 16:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

consistently check m_lazy_what.empty() also in production builds

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-05-10 17:09:32 -07:00
parent 0691d5f58d
commit 28de959fa4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/pybind11/pytypes.h
View File

@ -407,8 +407,11 @@ public:
if (m_lazy_what.empty()) {
try {
m_lazy_what = detail::error_string(m_type.ptr(), m_value.ptr(), m_trace.ptr());
// Uncomment to test the catch (...) block:
// throw std::runtime_error("Something went wrong.");
// Negate the if condition to test the catch(...) block below.
if (m_lazy_what.empty()) {
throw std::runtime_error(
"FATAL failure building pybind11::error_already_set error_string.");
}
} catch (...) {
// Terminating the process, to not mask the original error by errors in the error
// handling. Reporting the original error on stderr & stdout. Intentionally using
@ -448,7 +451,6 @@ public:
std::terminate();
}
}
assert(!m_lazy_what.empty());
return m_lazy_what.c_str();
}
@ -456,10 +458,7 @@ public:
/// already set it is cleared first. After this call, the current object no longer stores the
/// error variables (but the `.what()` string is still available).
void restore() {
what(); // Force-build `.what()`.
if (m_lazy_what.empty()) {
pybind11_fail("Critical error building lazy error_string().");
}
what(); // Force-build m_lazy_what.
if (m_type) {
PyErr_Restore(
m_type.release().ptr(), m_value.release().ptr(), m_trace.release().ptr());