fixes

python · colesbury · Dec 3, 2024 · Aug 21, 2024 · Aug 21, 2024 · Aug 22, 2024
commit c1b4c358838d50a8f407a37c805a8982a5334453
diff --git a/Lib/test/test_capi/test_structmembers.py b/Lib/test/test_capi/test_structmembers.py
@@ -37,6 +37,9 @@ def _make_test_object(cls):
                9.99999,# T_FLOAT
                10.1010101010, # T_DOUBLE
                "hi",   # T_STRING_INPLACE
+               12,     # T_LONGLONG
+               13,     # T_ULONGLONG
+               "c",    # T_CHAR
                )
 
 
@@ -162,6 +165,16 @@ def test_inplace_string(self):
         self.assertRaises(TypeError, setattr, ts, "T_STRING_INPLACE", "s")
         self.assertRaises(TypeError, delattr, ts, "T_STRING_INPLACE")
 
+    def test_char(self):
+        ts = self.ts
+        self.assertEqual(ts.T_CHAR, "c")
+        ts.T_CHAR = "z"
+        self.assertEqual(ts.T_CHAR, "z")
+        self.assertRaises(TypeError, setattr, ts, "T_CHAR", "")
+        self.assertRaises(TypeError, setattr, ts, "T_CHAR", b"a")
+        self.assertRaises(TypeError, setattr, ts, "T_CHAR", bytearray(b"b"))
+        self.assertRaises(TypeError, delattr, ts, "T_STRING_INPLACE")
+
 class ReadWriteTests_OldAPI(ReadWriteTests, unittest.TestCase):
     cls = _test_structmembersType_OldAPI
 

diff --git a/Modules/_testcapi/structmember.c b/Modules/_testcapi/structmember.c
@@ -60,7 +60,7 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
         "T_FLOAT", "T_DOUBLE", "T_STRING_INPLACE",
         "T_LONGLONG", "T_ULONGLONG", "T_CHAR",
         NULL};
-    static const char fmt[] = "|bbBhHiIlknfds#LK";
+    static const char fmt[] = "|bbBhHiIlknfds#LKC";
     test_structmembers *ob;
     const char *s = NULL;
     Py_ssize_t string_len = 0;
@@ -135,7 +135,7 @@ static struct PyMemberDef test_members[] = {
     {"T_STRING_INPLACE", T_STRING_INPLACE, offsetof(test_structmembers, structmembers.inplace_member), 0, NULL},
     {"T_LONGLONG", T_LONGLONG, offsetof(test_structmembers, structmembers.longlong_member), 0, NULL},
     {"T_ULONGLONG", T_ULONGLONG, offsetof(test_structmembers, structmembers.ulonglong_member), 0, NULL},
-    {"T_CHAR", Py_T_CHAR, offsetof(test_structmembers, structmembers.char_member), 0, NULL},
+    {"T_CHAR", T_CHAR, offsetof(test_structmembers, structmembers.char_member), 0, NULL},
     {NULL}
 };
 

diff --git a/Python/structmember.c b/Python/structmember.c
@@ -80,8 +80,8 @@ PyMember_GetOne(const char *obj_addr, PyMemberDef *l)
         v = PyUnicode_FromString((char*)addr);
         break;
     case Py_T_CHAR: {
-        char value = FT_ATOMIC_LOAD_CHAR_RELAXED(*addr);
-        v = PyUnicode_FromStringAndSize(&value, 1);
+        char char_val = FT_ATOMIC_LOAD_CHAR_RELAXED(*addr);
+        v = PyUnicode_FromStringAndSize(&char_val, 1);
         break;
     }
     case _Py_T_OBJECT:
@@ -252,12 +252,13 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
         }
         break;
     }
-    case Py_T_LONG:{
-        FT_ATOMIC_STORE_LONG_RELAXED(*(long*)addr, PyLong_AsLong(v));
-        if ((*(long*)addr == -1) && PyErr_Occurred())
+    case Py_T_LONG: {
+        const long long_val = PyLong_AsLong(v);
+        if ((long_val == -1) && PyErr_Occurred())
             return -1;
+        FT_ATOMIC_STORE_LONG_RELAXED(*(long*)addr, long_val);
         break;
-        }
+    }
     case Py_T_ULONG: {
         /* XXX: For compatibility, accept negative int values
            as well. */
@@ -284,25 +285,27 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
         }
         break;
     }
-    case Py_T_PYSSIZET:{
-        FT_ATOMIC_STORE_SSIZE_RELAXED(*(Py_ssize_t*)addr, PyLong_AsSsize_t(v));
-        if ((*(Py_ssize_t*)addr == (Py_ssize_t)-1)
-            && PyErr_Occurred())
-                        return -1;
+    case Py_T_PYSSIZET: {
+        const Py_ssize_t ssize_val = PyLong_AsSsize_t(v);
+        if ((ssize_val == (Py_ssize_t)-1) && PyErr_Occurred())
+            return -1;
+        FT_ATOMIC_STORE_SSIZE_RELAXED(*(Py_ssize_t*)addr, ssize_val);
         break;
-        }
+    }
     case Py_T_FLOAT:{
         double double_val = PyFloat_AsDouble(v);
         if ((double_val == -1) && PyErr_Occurred())
             return -1;
         FT_ATOMIC_STORE_FLOAT_RELAXED(*(float*)addr, (float)double_val);
         break;
         }
-    case Py_T_DOUBLE:
-        FT_ATOMIC_STORE_DOUBLE_RELAXED(*(double*)addr, PyFloat_AsDouble(v));
-        if ((*(double*)addr == -1) && PyErr_Occurred())
+    case Py_T_DOUBLE: {
+        const double double_val = PyFloat_AsDouble(v);
+        if ((double_val == -1) && PyErr_Occurred())
             return -1;
+        FT_ATOMIC_STORE_DOUBLE_RELAXED(*(double *) addr, double_val);
         break;
+    }
     case _Py_T_OBJECT:
     case Py_T_OBJECT_EX:
         Py_BEGIN_CRITICAL_SECTION(obj);
@@ -329,9 +332,9 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
         return -1;
     case Py_T_LONGLONG:{
         long long value = PyLong_AsLongLong(v);
-        FT_ATOMIC_STORE_LLONG_RELAXED(*(long long*)addr, value);
         if ((value == -1) && PyErr_Occurred())
             return -1;
+        FT_ATOMIC_STORE_LLONG_RELAXED(*(long long*)addr, value);
         break;
         }
     case Py_T_ULONGLONG: {