Merge pull request numpy#26586 from ngoldbaum/fix-stringdtype-memoryleaks

BUG: Fix memory leaks found by valgrind

Author: seberg

numpy/_core/src/multiarray/arraytypes.c.src

@@ -4222,6 +4222,7 @@ NPY_NO_EXPORT PyArray_Descr *
 PyArray_DescrFromType(int type)
 {
     PyArray_Descr *ret = NULL;
+    npy_bool is_stringdtype = (type == NPY_VSTRING || type == NPY_VSTRINGLTR);
 
     if (type < 0) {
         /*
@@ -4233,7 +4234,7 @@ PyArray_DescrFromType(int type)
          */
         ret = NULL;
     }
-    else if (type == NPY_VSTRING || type == NPY_VSTRINGLTR) {
+    else if  (is_stringdtype) {
         ret = (PyArray_Descr *)new_stringdtype_instance(NULL, 1);
     }
     // builtin legacy dtypes
@@ -4280,7 +4281,7 @@ PyArray_DescrFromType(int type)
         PyErr_SetString(PyExc_ValueError,
                 "Invalid data-type for array");
     }
-    else {
+    else if (!is_stringdtype) {
         Py_INCREF(ret);
     }
 

numpy/_core/src/multiarray/descriptor.c

@@ -2025,6 +2025,7 @@ arraydescr_dealloc(PyArray_Descr *self)
 {
     Py_XDECREF(self->typeobj);
     if (!PyDataType_ISLEGACY(self)) {
+        Py_TYPE(self)->tp_free((PyObject *)self);
         return;
     }
     _PyArray_LegacyDescr *lself = (_PyArray_LegacyDescr *)self;

numpy/_core/src/multiarray/stringdtype/casts.c

@@ -894,6 +894,7 @@ string_to_pyfloat(char *in, int has_null,
                 goto fail;                                                    \
             }                                                                 \
             double dval = PyFloat_AS_DOUBLE(pyfloat_value);                   \
+            Py_DECREF(pyfloat_value);                                         \
             npy_##typename fval = (double_to_float)(dval);                    \
                                                                               \
             if (NPY_UNLIKELY(isinf_name(fval) && !(npy_isinf(dval)))) {       \