BUG: avoid incorrect type punning in NpyString_acquire_allocators

ngoldbaum · ngoldbaum · commit 511dc89205fa · 2024-03-07T10:06:25.000-07:00
diff --git a/numpy/_core/src/highway b/numpy/_core/src/highway
@@ -1 +1 @@
-Subproject commit 58b52a717469e62b2d9b8eaa2f5dddb44d4a4cbf
+Subproject commit ba0900a4957b929390ab73827235557959234fea
diff --git a/numpy/_core/src/multiarray/stringdtype/static_string.c b/numpy/_core/src/multiarray/stringdtype/static_string.c
@@ -328,6 +328,9 @@ NpyString_acquire_allocators(size_t n_descriptors,
         }
         int allocators_match = 0;
         for (size_t j=0; j<i; j++) {
+            if (allocators[j] == NULL) {
+                continue;
+            }
             if (((PyArray_StringDTypeObject *)descrs[i])->allocator ==
                 ((PyArray_StringDTypeObject *)descrs[j])->allocator)
             {

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,9 @@ NpyString_acquire_allocators(size_t n_descriptors,`
`328`	`328`	`}`
`329`	`329`	`int allocators_match = 0;`
`330`	`330`	`for (size_t j=0; j<i; j++) {`
	`331`	`+ if (allocators[j] == NULL) {`
	`332`	`+ continue;`
	`333`	`+ }`
`331`	`334`	`if (((PyArray_StringDTypeObject *)descrs[i])->allocator ==`
`332`	`335`	`((PyArray_StringDTypeObject *)descrs[j])->allocator)`
`333`	`336`	`{`