Merge pull request #27958 from charris/backport-27955

charris · web-flow · commit c62f9fee23b3 · 2024-12-09T17:05:56.000-07:00
BUG: fix use-after-free error in npy_hashtable.cpp (#27955)
diff --git a/numpy/_core/src/common/npy_hashtable.cpp b/numpy/_core/src/common/npy_hashtable.cpp
@@ -126,10 +126,10 @@ NPY_NO_EXPORT void
 PyArrayIdentityHash_Dealloc(PyArrayIdentityHash *tb)
 {
     PyMem_Free(tb->buckets);
-    PyMem_Free(tb);
 #ifdef Py_GIL_DISABLED
     delete (std::shared_mutex *)tb->mutex;
 #endif
+    PyMem_Free(tb);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -126,10 +126,10 @@ NPY_NO_EXPORT void`
`126`	`126`	`PyArrayIdentityHash_Dealloc(PyArrayIdentityHash *tb)`
`127`	`127`	`{`
`128`	`128`	`PyMem_Free(tb->buckets);`
`129`		`- PyMem_Free(tb);`
`130`	`129`	`#ifdef Py_GIL_DISABLED`
`131`	`130`	`delete (std::shared_mutex *)tb->mutex;`
`132`	`131`	`#endif`
	`132`	`+ PyMem_Free(tb);`
`133`	`133`	`}`
`134`	`134`
`135`	`135`