Merge pull request #27672 from charris/backport-27666

charris · web-flow · commit daa8699a4145 · 2024-10-30T10:47:25.000-06:00
BUG: Fix a reference count leak in npy_find_descr_for_scalar.
diff --git a/numpy/_core/src/multiarray/abstractdtypes.c b/numpy/_core/src/multiarray/abstractdtypes.c
@@ -476,7 +476,6 @@ npy_find_descr_for_scalar(
             /* If the DType doesn't know the scalar type, guess at default. */
             !NPY_DT_CALL_is_known_scalar_type(common, Py_TYPE(scalar))) {
         if (common->singleton != NULL) {
-            Py_INCREF(common->singleton);
             res = common->singleton;
             Py_INCREF(res);
         }

Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,6 @@ npy_find_descr_for_scalar(`
`476`	`476`	`/* If the DType doesn't know the scalar type, guess at default. */`
`477`	`477`	`!NPY_DT_CALL_is_known_scalar_type(common, Py_TYPE(scalar))) {`
`478`	`478`	`if (common->singleton != NULL) {`
`479`		`- Py_INCREF(common->singleton);`
`480`	`479`	`res = common->singleton;`
`481`	`480`	`Py_INCREF(res);`
`482`	`481`	`}`