Merge pull request numpy#26567 from seberg/fix-leaks-2

BUG: fix memory leaks found with valgrind (next)

Author: charris

numpy/_core/src/multiarray/dtype_traversal.c

@@ -398,13 +398,6 @@ subarray_traverse_data_free(NpyAuxData *data)
 }
 
 
-/*
- * We seem to be neither using nor exposing this right now, so leave it NULL.
- * (The implementation below should be functional.)
- */
-#define subarray_traverse_data_clone NULL
-
-#ifndef subarray_traverse_data_clone
 /* traverse data copy function */
 static NpyAuxData *
 subarray_traverse_data_clone(NpyAuxData *data)
@@ -426,7 +419,6 @@ subarray_traverse_data_clone(NpyAuxData *data)
 
     return (NpyAuxData *)newdata;
 }
-#endif
 
 
 static int
@@ -469,7 +461,7 @@ get_subarray_traverse_func(
 
     auxdata->count = size;
     auxdata->base.free = &subarray_traverse_data_free;
-    auxdata->base.clone = subarray_traverse_data_clone;
+    auxdata->base.clone = &subarray_traverse_data_clone;
 
     if (get_traverse_func(
             traverse_context, dtype, aligned,

numpy/_core/src/multiarray/dtype_traversal.h

@@ -69,18 +69,22 @@ static inline int
 NPY_traverse_info_copy(
         NPY_traverse_info *traverse_info, NPY_traverse_info *original)
 {
-    traverse_info->func = NULL;
+    /* Note that original may be identical to traverse_info! */
     if (original->func == NULL) {
         /* Allow copying also of unused clear info */
+        traverse_info->func = NULL;
         return 0;
     }
-    traverse_info->auxdata = NULL;
     if (original->auxdata != NULL) {
         traverse_info->auxdata = NPY_AUXDATA_CLONE(original->auxdata);
         if (traverse_info->auxdata == NULL) {
+            traverse_info->func = NULL;
             return -1;
         }
     }
+    else {
+        traverse_info->auxdata = NULL;
+    }
     Py_INCREF(original->descr);
     traverse_info->descr = original->descr;
     traverse_info->func = original->func;

numpy/_core/src/multiarray/item_selection.c

@@ -397,7 +397,7 @@ PyArray_PutTo(PyArrayObject *self, PyObject* values0, PyObject *indices0,
     if ((ni > 0) && (PyArray_Size((PyObject *)self) == 0)) {
         PyErr_SetString(PyExc_IndexError, 
                         "cannot replace elements of an empty array");
-        return NULL;
+        goto fail;
     }
     Py_INCREF(PyArray_DESCR(self));
     values = (PyArrayObject *)PyArray_FromAny(values0, PyArray_DESCR(self), 0, 0,
@@ -419,9 +419,8 @@ PyArray_PutTo(PyArrayObject *self, PyObject* values0, PyObject *indices0,
         Py_INCREF(PyArray_DESCR(self));
         obj = (PyArrayObject *)PyArray_FromArray(self,
                                                  PyArray_DESCR(self), flags);
-        if (obj != self) {
-            copied = 1;
-        }
+        copied = 1;
+        assert(self != obj);
         self = obj;
     }
     max_item = PyArray_SIZE(self);

numpy/_core/src/umath/wrapping_array_method.c

@@ -96,6 +96,7 @@ wrapping_auxdata_free(wrapping_auxdata *wrapping_auxdata)
 
     if (wrapping_auxdata_freenum < WRAPPING_AUXDATA_FREELIST_SIZE) {
         wrapping_auxdata_freelist[wrapping_auxdata_freenum] = wrapping_auxdata;
+        wrapping_auxdata_freenum++;
     }
     else {
         PyMem_Free(wrapping_auxdata);