FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.13] gh-156196: Fix a failed assignment to a PyMemberDef attribute changing its value by serhiy-storchaka · Pull Request #156197 · python/cpython · GitHub

/ cpython Public

[3.13] gh-156196: Fix a failed assignment to a PyMemberDef attribute changing its value #156197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Aug 21, 2026
Conversation 0 Commits 1 Checks 40 Files changed
Merged

[3.13] gh-156196: Fix a failed assignment to a PyMemberDef attribute changing its value #156197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 7 additions & 1 deletion Lib/test/test_capi/test_structmembers.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ def _test_warn(self, name, value, expected=None):

def _test_overflow(self, name, value):
ts = self.ts
oldvalue = getattr(ts, name)
self.assertRaises(OverflowError, setattr, ts, name, value)
# a failed assignment does not change the value
self.assertEqual(getattr(ts, name), oldvalue)

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

def test_inplace_string(self):
ts = self.ts
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-08-21-18-00-00.gh-issue-156196.Mv7kBq.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
A failed assignment to an attribute defined with :c:type:`PyMemberDef` of
type ``Py_T_LONG``, ``Py_T_LONGLONG``, ``Py_T_PYSSIZET`` or ``Py_T_DOUBLE``
no longer changes its value.
25 changes: 14 additions & 11 deletions Python/structmember.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
break;
}
case Py_T_LONG:{
*(long*)addr = PyLong_AsLong(v);
if ((*(long*)addr == -1) && PyErr_Occurred())
long long_val = PyLong_AsLong(v);
if ((long_val == -1) && PyErr_Occurred())
return -1;
*(long*)addr = long_val;
break;
}
case Py_T_ULONG: {
Expand Down Expand Up @@ -283,10 +284,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
break;
}
case Py_T_PYSSIZET:{
*(Py_ssize_t*)addr = PyLong_AsSsize_t(v);
if ((*(Py_ssize_t*)addr == (Py_ssize_t)-1)
&& PyErr_Occurred())
return -1;
Py_ssize_t ssize_val = PyLong_AsSsize_t(v);
if ((ssize_val == (Py_ssize_t)-1) && PyErr_Occurred())
return -1;
*(Py_ssize_t*)addr = ssize_val;
break;
}
case Py_T_FLOAT:{
Expand All @@ -296,11 +297,13 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
*(float*)addr = (float)double_val;
break;
}
case Py_T_DOUBLE:
*(double*)addr = PyFloat_AsDouble(v);
if ((*(double*)addr == -1) && PyErr_Occurred())
case Py_T_DOUBLE:{
double double_val = PyFloat_AsDouble(v);
if ((double_val == -1) && PyErr_Occurred())
return -1;
*(double*)addr = double_val;
break;
}
case _Py_T_OBJECT:
case Py_T_OBJECT_EX:
Py_BEGIN_CRITICAL_SECTION(obj);
Expand All @@ -326,10 +329,10 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
PyErr_SetString(PyExc_TypeError, "readonly attribute");
return -1;
case Py_T_LONGLONG:{
long long value;
*(long long*)addr = value = PyLong_AsLongLong(v);
long long value = PyLong_AsLongLong(v);
if ((value == -1) && PyErr_Occurred())
return -1;
*(long long*)addr = value;
break;
}
case Py_T_ULONGLONG: {
Expand Down
Loading
Back | FazBrowse Home | New Git URL