Skip to content

GH-49942: [Python] Protect PyBuffer and NumPyBuffer destructors against interpreter finalization #49943

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

Open
pitrou wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −3
Open

GH-49942: [Python] Protect PyBuffer and NumPyBuffer destructors against interpreter finalization #49943

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
3 changes: 2 additions & 1 deletion python/pyarrow/src/arrow/python/common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ Result<std::shared_ptr<Buffer>> PyBuffer::FromPyObject(PyObject* obj) {
}

PyBuffer::~PyBuffer() {
if (data_ != nullptr) {
// GH-38626: destructor may be called after the Python interpreter is finalized.
if (Py_IsInitialized() && data_ != nullptr) {
PyAcquireGIL lock;
PyBuffer_Release(&py_buf_);
}
Expand Down
7 changes: 5 additions & 2 deletions python/pyarrow/src/arrow/python/numpy_convert.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ NumPyBuffer::NumPyBuffer(PyObject* ao) : Buffer(nullptr, 0) {
}

NumPyBuffer::~NumPyBuffer() {
PyAcquireGIL lock;
Py_XDECREF(arr_);
// GH-38626: destructor may be called after the Python interpreter is finalized.
if (Py_IsInitialized()) {
PyAcquireGIL lock;
Py_XDECREF(arr_);
}
}

#define TO_ARROW_TYPE_CASE(NPY_NAME, FACTORY) \
Expand Down
Loading