Skip to content

Fix to memory leak in python C / Fortran wrapper #60

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
jessjaco wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix to memory leak in python C / Fortran wrapper #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
030b5b2
clean up old arrays before allocating new ones
jessjaco Jun 18, 2025
a536576
slight cleanup
jessjaco Jun 19, 2025
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
22 changes: 18 additions & 4 deletions fc/unmix/unmiximage_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,13 @@ static PyObject* py_unmiximage(PyObject* self, PyObject* args) {
}

// Ensure the image array is Fortran-contiguous (column-major)
int new_image_obj = 0;
if (!PyArray_ISFARRAY(image_obj)) {
image_obj = (PyArrayObject*) PyArray_FromAny(image_obj,
PyArray_DescrFromType(NPY_DOUBLE),
3, 3, NPY_ARRAY_F_CONTIGUOUS, NULL);
// track if image_obj was replaced, so we can clean up later
new_image_obj = 1;
if (image_obj == NULL) {
PyErr_SetString(PyExc_ValueError, "Failed to convert image to Fortran-contiguous.");
return NULL;
Expand Down Expand Up @@ -97,15 +100,26 @@ static PyObject* py_unmiximage(PyObject* self, PyObject* args) {
// Call the Fortran subroutine with the deduced dimensions and input/output arrays
unmiximage_(image, endMemberMatrix, &numBands, &numEndMembers, &numRows, &numCols, &inNull, &outNull, fractionsImage);

// Remove our reference to image_obj
if (new_image_obj) {
Py_DECREF(image_obj);
}

// Convert array to c-contiguous before return
if (!PyArray_ISCARRAY(fractionsImage_obj)) {
fractionsImage_obj = (PyArrayObject*) PyArray_FromArray(fractionsImage_obj,
PyArray_DescrFromType(NPY_DOUBLE),
NPY_ARRAY_C_CONTIGUOUS);
if (!fractionsImage_obj) {
PyArrayObject* temp = (PyArrayObject*) PyArray_FromArray(
fractionsImage_obj,
PyArray_DescrFromType(NPY_DOUBLE),
NPY_ARRAY_C_CONTIGUOUS);

if (temp == NULL) {
PyErr_SetString(PyExc_ValueError, "Failed to convert fractionsImage to C-contiguous.");
Py_DECREF(fractionsImage_obj); // Clean up original
return NULL;
}

Py_DECREF(fractionsImage_obj); // Drop reference to original array
fractionsImage_obj = temp; // Assign the new one
}

return PyArray_Return(fractionsImage_obj);
Expand Down