Skip to content

BUG: fix memory leaks in init_iter_all when called on non C-contiguous arrays #545

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
neutrinoceros wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −5
Open

BUG: fix memory leaks in init_iter_all when called on non C-contiguous arrays #545

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47dd2f0
BUG: fix memory leaks in `init_iter_all` when called on non C-contigu…
neutrinoceros Apr 3, 2026
753c0ec
fixup! BUG: fix memory leaks in `init_iter_all` when called on non C-…
neutrinoceros Apr 3, 2026
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: 14 additions & 5 deletions bottleneck/src/iterators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ init_iter_one(iter *it, PyArrayObject *a, int axis)
* calling Py_DECREF(it.a_ravel) after you are done with the iterator.
* See nanargmin for an example.
*/
static inline void
static inline int
init_iter_all(iter *it, PyArrayObject *a, int ravel, int anyorder)
{
int i, j = 0;
Expand Down Expand Up @@ -129,22 +129,30 @@ init_iter_all(iter *it, PyArrayObject *a, int ravel, int anyorder)
}
} else {
it->ndim_m2 = -1;
PyArrayObject *tmp = NULL;
if (anyorder) {
a = (PyArrayObject *)PyArray_Ravel(a, NPY_ANYORDER);
tmp = (PyArrayObject *)PyArray_Ravel(a, NPY_ANYORDER);
} else {
a = (PyArrayObject *)PyArray_Ravel(a, NPY_CORDER);
tmp = (PyArrayObject *)PyArray_Ravel(a, NPY_CORDER);
}
//Py_DECREF(a);
if (tmp == NULL) return -1;
a = tmp;
it->a_ravel = a;
it->length = PyArray_DIM(a, 0);
it->astride = PyArray_STRIDE(a, 0);
}
} else if (ravel) {
it->ndim_m2 = -1;
PyArrayObject *tmp = NULL;
if (anyorder) {
a = (PyArrayObject *)PyArray_Ravel(a, NPY_ANYORDER);
tmp = (PyArrayObject *)PyArray_Ravel(a, NPY_ANYORDER);
} else {
a = (PyArrayObject *)PyArray_Ravel(a, NPY_CORDER);
tmp = (PyArrayObject *)PyArray_Ravel(a, NPY_CORDER);
}
//Py_DECREF(a);
if (tmp == NULL) return -1;
a = tmp;
it->a_ravel = a;
it->length = PyArray_DIM(a, 0);
it->astride = PyArray_STRIDE(a, 0);
Expand All @@ -171,6 +179,7 @@ init_iter_all(iter *it, PyArrayObject *a, int ravel, int anyorder)

it->stride = it->astride / item_size;
it->pa = PyArray_BYTES(a);
return 0;
}

#define NEXT \
Expand Down