unsigned long race

Author: dpdani

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -89,6 +89,8 @@ extern "C" {
     _Py_atomic_store_long_release(&value, new_value)
 #define FT_ATOMIC_LOAD_LONG_RELAXED(value) \
     _Py_atomic_load_long_relaxed(&value)
+#define FT_ATOMIC_STORE_ULONG(value, new_value) \
+    _Py_atomic_store_ulong(&value, new_value)
 
 #else
 #define FT_ATOMIC_LOAD_PTR(value) value
@@ -126,6 +128,7 @@ extern "C" {
 #define FT_ATOMIC_STORE_UINT_RELEASE(value, new_value) value = new_value
 #define FT_ATOMIC_LOAD_LONG_RELAXED(value) value
 #define FT_ATOMIC_STORE_LONG_RELEASE(value, new_value) value = new_value
+#define FT_ATOMIC_STORE_ULONG(value, new_value) value = new_value
 
 #endif
 

Python/structmember.c

@@ -58,7 +58,7 @@ PyMember_GetOne(const char *obj_addr, PyMemberDef *l)
         v = PyLong_FromLong(FT_ATOMIC_LOAD_LONG_RELAXED(*(long*)addr));
         break;
     case Py_T_ULONG:
-        v = PyLong_FromUnsignedLong(*(unsigned long*)addr);
+        v = PyLong_FromUnsignedLong(FT_ATOMIC_LOAD_ULONG_RELAXED(*(unsigned long*)addr));
         break;
     case Py_T_PYSSIZET:
         v = PyLong_FromSsize_t(*(Py_ssize_t*)addr);
@@ -269,7 +269,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
             if (long_val == -1 && PyErr_Occurred()) {
                 return -1;
             }
-            *(unsigned long *)addr = (unsigned long)long_val;
+            FT_ATOMIC_STORE_ULONG(*(unsigned long *)addr, (unsigned long)long_val);
             WARN("Writing negative value into unsigned field");
         }
         else {
@@ -278,7 +278,7 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
             if (ulong_val == (unsigned long)-1 && PyErr_Occurred()) {
                 return -1;
             }
-            *(unsigned long*)addr = ulong_val;
+            FT_ATOMIC_STORE_ULONG(*(unsigned long *)addr, ulong_val);
         }
         break;
     }