From 8e54167aa7e9806deb4d2712dbbe1c13e461d74d Mon Sep 17 00:00:00 2001 From: Francesco Biscani Date: Sat, 16 Mar 2024 10:26:35 +0100 Subject: [PATCH] First attempt a limiting the error msg size. --- include/pybind11/pybind11.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h index b87fe66b27..fa51728561 100644 --- a/include/pybind11/pybind11.h +++ b/include/pybind11/pybind11.h @@ -1122,9 +1122,13 @@ class cpp_function : public function { msg += '\n'; } msg += "\nInvoked with: "; + constexpr auto max_args_repr_size = 5000u; + const auto orig_msg_size = msg.size(); auto args_ = reinterpret_borrow(args_in); bool some_args = false; - for (size_t ti = overloads->is_constructor ? 1 : 0; ti < args_.size(); ++ti) { + for (size_t ti = overloads->is_constructor ? 1 : 0; + ti < args_.size() && msg.size() - orig_msg_size <= max_args_repr_size; + ++ti) { if (!some_args) { some_args = true; } else { @@ -1136,7 +1140,7 @@ class cpp_function : public function { msg += ""; } } - if (kwargs_in) { + if (kwargs_in && msg.size() - orig_msg_size <= max_args_repr_size) { auto kwargs = reinterpret_borrow(kwargs_in); if (!kwargs.empty()) { if (some_args) { @@ -1145,6 +1149,10 @@ class cpp_function : public function { msg += "kwargs: "; bool first = true; for (const auto &kwarg : kwargs) { + if (msg.size() - orig_msg_size > max_args_repr_size) { + break; + } + if (first) { first = false; } else { @@ -1160,6 +1168,10 @@ class cpp_function : public function { } } + if (msg.size() - orig_msg_size > max_args_repr_size) { + msg += "..."; + } + append_note_if_missing_header_is_suspected(msg); // Attach additional error info to the exception if supported if (PyErr_Occurred()) {