Skip to content

Commit e178a13

Browse files
[3.13] gh-156196: Fix a failed assignment to a PyMemberDef attribute changing its value (GH-156197)
PyMember_SetOne() stored the result of the conversion before checking it for an error.
1 parent 081e0be commit e178a13

3 files changed

Lines changed: 24 additions & 12 deletions

File tree

Lib/test/test_capi/test_structmembers.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ def _test_warn(self, name, value, expected=None):
6060

6161
def _test_overflow(self, name, value):
6262
ts = self.ts
63+
oldvalue = getattr(ts, name)
6364
self.assertRaises(OverflowError, setattr, ts, name, value)
65+
# a failed assignment does not change the value
66+
self.assertEqual(getattr(ts, name), oldvalue)
6467

6568
def _test_int_range(self, name, minval, maxval, *, hardlimit=None,
6669
indexlimit=None):
@@ -154,8 +157,11 @@ def test_bad_assignments(self):
154157
# issue8014: this produced 'bad argument to internal function'
155158
# internal error
156159
for nonint in None, 3.2j, "full of eels", {}, []:
157-
for attr in integer_attributes:
160+
for attr in integer_attributes + ['T_FLOAT', 'T_DOUBLE']:
161+
oldvalue = getattr(ts, attr)
158162
self.assertRaises(TypeError, setattr, ts, attr, nonint)
163+
# a failed assignment does not change the value
164+
self.assertEqual(getattr(ts, attr), oldvalue)
159165

160166
def test_inplace_string(self):
161167
ts = self.ts
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
A failed assignment to an attribute defined with :c:type:`PyMemberDef` of
2+
type ``Py_T_LONG``, ``Py_T_LONGLONG``, ``Py_T_PYSSIZET`` or ``Py_T_DOUBLE``
3+
no longer changes its value.

Python/structmember.c

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
251251
break;
252252
}
253253
case Py_T_LONG:{
254-
*(long*)addr = PyLong_AsLong(v);
255-
if ((*(long*)addr == -1) && PyErr_Occurred())
254+
long long_val = PyLong_AsLong(v);
255+
if ((long_val == -1) && PyErr_Occurred())
256256
return -1;
257+
*(long*)addr = long_val;
257258
break;
258259
}
259260
case Py_T_ULONG: {
@@ -283,10 +284,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
283284
break;
284285
}
285286
case Py_T_PYSSIZET:{
286-
*(Py_ssize_t*)addr = PyLong_AsSsize_t(v);
287-
if ((*(Py_ssize_t*)addr == (Py_ssize_t)-1)
288-
&& PyErr_Occurred())
289-
return -1;
287+
Py_ssize_t ssize_val = PyLong_AsSsize_t(v);
288+
if ((ssize_val == (Py_ssize_t)-1) && PyErr_Occurred())
289+
return -1;
290+
*(Py_ssize_t*)addr = ssize_val;
290291
break;
291292
}
292293
case Py_T_FLOAT:{
@@ -296,11 +297,13 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
296297
*(float*)addr = (float)double_val;
297298
break;
298299
}
299-
case Py_T_DOUBLE:
300-
*(double*)addr = PyFloat_AsDouble(v);
301-
if ((*(double*)addr == -1) && PyErr_Occurred())
300+
case Py_T_DOUBLE:{
301+
double double_val = PyFloat_AsDouble(v);
302+
if ((double_val == -1) && PyErr_Occurred())
302303
return -1;
304+
*(double*)addr = double_val;
303305
break;
306+
}
304307
case _Py_T_OBJECT:
305308
case Py_T_OBJECT_EX:
306309
Py_BEGIN_CRITICAL_SECTION(obj);
@@ -326,10 +329,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
326329
PyErr_SetString(PyExc_TypeError, "readonly attribute");
327330
return -1;
328331
case Py_T_LONGLONG:{
329-
long long value;
330-
*(long long*)addr = value = PyLong_AsLongLong(v);
332+
long long value = PyLong_AsLongLong(v);
331333
if ((value == -1) && PyErr_Occurred())
332334
return -1;
335+
*(long long*)addr = value;
333336
break;
334337
}
335338
case Py_T_ULONGLONG: {

0 commit comments

Comments
 (0)