Fix the test.

python · encukou · Jan 13, 2025 · Jan 4, 2025 · Jan 4, 2025 · Jan 4, 2025
commit da293c14262a946b00c08fa45aa3ea7dd2551fda
diff --git a/Lib/test/test_ctypes/test_arrays.py b/Lib/test/test_ctypes/test_arrays.py
@@ -5,7 +5,7 @@
                     create_string_buffer, create_unicode_buffer,
                     c_char, c_wchar, c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
                     c_long, c_ulonglong, c_float, c_double, c_longdouble)
-from test.support import bigmemtest, _2G, threading_helper
+from test.support import bigmemtest, _2G, threading_helper, Py_GIL_DISABLED
 from ._support import (_CData, PyCArrayType, Py_TPFLAGS_DISALLOW_INSTANTIATION,
                        Py_TPFLAGS_IMMUTABLETYPE)
 
@@ -268,7 +268,7 @@ def test_large_array(self, size):
         c_char * size
 
     @threading_helper.requires_working_threading()
-    @unittest.skipUnless(support.Py_GIL_DISABLED, "only meaningful if the GIL is disabled")
+    @unittest.skipUnless(Py_GIL_DISABLED, "only meaningful if the GIL is disabled")
     def test_thread_safety(self):
         from threading import Thread
 
@@ -280,7 +280,7 @@ def run():
                 buffer[0] = b"j"
 
         with threading_helper.catch_threading_exception() as cm:
-            with threading_helper.start_threads((run for _ in range(25))):
+            with threading_helper.start_threads((Thread(target=run) for _ in range(25))):
                 pass
 
             self.assertIsNone(cm.exc_value)

diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h
@@ -587,6 +587,6 @@ static inline void
 locked_deref_assign(CDataObject *self, void *new_ptr)
 {
     LOCK_PTR(self);
-    *self->b_ptr = new_ptr;
+    *(void **)self->b_ptr = new_ptr;
     UNLOCK_PTR(self);
 }