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

chore: added check on iterator end position #5129

Merged
merged 6 commits into from
May 28, 2024
Merged

chore: added check on iterator end position #5129

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92e5152
Added check on iterator end position
cliffburdick May 20, 2024
0b81e67
Always use assert without conditional check
cliffburdick May 26, 2024
895bb4b
Addressing code review comments
cliffburdick May 27, 2024
3ce2db2
style: pre-commit fixes
pre-commit-ci[bot] May 27, 2024
f095316
Remove assert and throw
cliffburdick May 27, 2024
1c1a9c2
Changed style slightly
cliffburdick May 28, 2024
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
19 changes: 11 additions & 8 deletions include/pybind11/detail/class.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,15 +388,18 @@ inline void clear_patients(PyObject *self) {
auto *instance = reinterpret_cast<detail::instance *>(self);
auto &internals = get_internals();
auto pos = internals.patients.find(self);

assert(pos != internals.patients.end());
// Clearing the patients can cause more Python code to run, which
// can invalidate the iterator. Extract the vector of patients
// from the unordered_map first.
auto patients = std::move(pos->second);
internals.patients.erase(pos);
instance->has_patients = false;
for (PyObject *&patient : patients) {
Py_CLEAR(patient);
if (pos != internals.patients.end()) {
cliffburdick marked this conversation as resolved.
Show resolved Hide resolved
// Clearing the patients can cause more Python code to run, which
// can invalidate the iterator. Extract the vector of patients
// from the unordered_map first.
auto patients = std::move(pos->second);
internals.patients.erase(pos);
instance->has_patients = false;
for (PyObject *&patient : patients) {
Py_CLEAR(patient);
}
}
}

Expand Down
Loading