8000 BUG: fix choose refcount leak by charris · Pull Request #24328 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: fix choose refcount leak #24328

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

Merged
merged 6 commits into from
Aug 3, 2023
Merged

BUG: fix choose refcount leak #24328

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec9c025
BUG: fix choose refcount leak
tylerjereddy Jul 15, 2023
6e41cd6
BUG: PR 24188 revisions
tylerjereddy Jul 18, 2023
fbf8dbc
MAINT: PR 24188 revisions
tylerjereddy Jul 25, 2023
e4b880e
MAINT: Use explicit copy path in choose based on refcheck
seberg Jul 31, 2023
1c22bf7
BUG: Remove unnecessary (and now also segfaulting) iterator creation
seberg Jul 31, 2023
87a93ef
ENH: Use `memcpy` and swap order
seberg Ju 8000 l 31, 2023
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
Prev Previous commit
Next Next commit
BUG: PR 24188 revisions 
* remove copyswap, carefully controlling
the reference counting to pass the testsuite
  • Loading branch information
@tylerjereddy @charris
tylerjereddy authored and charris committed Aug 3, 2023
commit 6e41cd6ccbfdd6a8518ab98738feedaf799bf9cd
30 changes: 25 additions & 5 deletions numpy/core/src/multiarray/item_selection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,8 +962,7 @@ PyArray_Choose(PyArrayObject *ip, PyObject *op, PyArrayObject *out,
{
PyArrayObject *obj = NULL;
PyArray_Descr *dtype;
PyArray_CopySwapFunc *copyswap;
int n, elsize, swap;
int n, elsize;
npy_intp i;
char *ret_data;
PyArrayObject **mps, *ap;
Expand Down Expand Up @@ -1043,8 +1042,6 @@ PyArray_Choose(PyArrayObject *ip, PyObject *op, PyArrayObject *out,
}
elsize = PyArray_DESCR(obj)->elsize;
ret_data = PyArray_DATA(obj);
copyswap = dtype->f->copyswap;
swap = !PyArray_ISNBO(dtype->byteorder);

while (PyArray_MultiIter_NOTDONE(multi)) {
mi = *((npy_intp *)PyArray_MultiIter_DATA(multi, n));
Expand Down Expand Up @@ -1077,11 +1074,34 @@ PyArray_Choose(PyArrayObject *ip, PyObject *op, PyArrayObject *out,
break;
}
}
copyswap(ret_data, PyArray_MultiIter_DATA(multi, mi), swap, NULL);
if (out != NULL) {
char *args[2] = {PyArray_MultiIter_DATA(multi, mi), ret_data};
npy_intp transfer_strides[2] = {elsize, elsize};
npy_intp one = 1;
NPY_ARRAYMETHOD_FLAGS transfer_flags = 0;
NPY_cast_info cast_info = {.func = NULL};
PyArrayIterObject *ind_it = (PyArrayIterObject *)PyArray_IterNew((PyObject *)out);
int is_aligned = IsUintAligned(ind_it->ao);
PyArray_GetDTypeTransferFunction(
is_aligned,
PyArray_DESCR(mps[0])->elsize,
PyArray_DESCR(obj)->elsize,
PyArray_DESCR(mps[0]),
PyArray_DESCR(obj), 0, &cast_info,
&transfer_flags);
cast_info.func(&cast_info.context, args, &one,
transfer_strides, cast_info.auxdata);
}
else {
memmove(ret_data, PyArray_MultiIter_DATA(multi, mi), elsize);
}
ret_data += elsize;
PyArray_MultiIter_NEXT(multi);
}

if (out == NULL) {
PyArray_INCREF(obj);
}
Py_DECREF(multi);
for (i = 0; i < n; i++) {
Py_XDECREF(mps[i]);
Expand Down
0