Skip to content

GH-145914: Fill newly created tuple with Py_None instead of NULL #145913

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

Open
sergey-miryanov wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −15
Open

GH-145914: Fill newly created tuple with Py_None instead of NULL #145913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d30b514
Fill newly created tuple with Py_None instead of NULL
sergey-miryanov Mar 13, 2026
bb8a69d
Fix resize
sergey-miryanov Mar 13, 2026
16de50a
Fix asserts
sergey-miryanov Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Lib/test/test_capi/test_tuple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ def test_tuple_new(self):
# Test PyTuple_New()
tuple_new = _testlimitedcapi.tuple_new
size = _testlimitedcapi.tuple_size
checknull = _testcapi._check_tuple_item_is_NULL

tup1 = tuple_new(0)
self.assertEqual(tup1, ())
Expand All @@ -66,7 +65,7 @@ def test_tuple_new(self):
self.assertIs(type(tup2), tuple)
self.assertEqual(size(tup2), 1)
self.assertIsNot(tup2, tup1)
self.assertTrue(checknull(tup2, 0))
self.assertIsNone(tup2[0])
self._tracked(tup2)

self.assertRaises(SystemError, tuple_new, -1)
Expand Down Expand Up @@ -299,7 +298,6 @@ def test_tuple_set_item(self):
def test__tuple_resize(self):
# Test _PyTuple_Resize()
resize = _testcapi._tuple_resize
checknull = _testcapi._check_tuple_item_is_NULL

a = ()
b = resize(a, 0, False)
Expand All @@ -308,8 +306,8 @@ def test__tuple_resize(self):
b = resize(a, 2, False)
self.assertEqual(len(a), 0)
self.assertEqual(len(b), 2)
self.assertTrue(checknull(b, 0))
self.assertTrue(checknull(b, 1))
self.assertIsNone(b[0])
self.assertIsNone(b[1])

a = ([1], [2], [3])
b = resize(a, 3)
Expand All @@ -319,8 +317,8 @@ def test__tuple_resize(self):
b = resize(a, 5)
self.assertEqual(len(b), 5)
self.assertEqual(b[:3], a)
self.assertTrue(checknull(b, 3))
self.assertTrue(checknull(b, 4))
self.assertIsNone(b[3])
self.assertIsNone(b[4])

a = ()
self.assertRaises(MemoryError, resize, a, PY_SSIZE_T_MAX)
Expand Down
10 changes: 5 additions & 5 deletions Objects/tupleobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ PyTuple_New(Py_ssize_t size)
return NULL;
}
for (Py_ssize_t i = 0; i < size; i++) {
op->ob_item[i] = NULL;
op->ob_item[i] = Py_None;
}
_PyObject_GC_TRACK(op);
return (PyObject *) op;
Expand Down Expand Up @@ -1050,10 +1050,10 @@ _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
return -1;
}
_Py_NewReferenceNoTotal((PyObject *) sv);
/* Zero out items added by growing */
if (newsize > oldsize)
memset(&sv->ob_item[oldsize], 0,
sizeof(*sv->ob_item) * (newsize - oldsize));
/* Set items added by growing to Py_None */
for(i = oldsize; i < newsize;i++) {
sv->ob_item[i] = Py_None;
}
*pv = (PyObject *) sv;
_PyObject_GC_TRACK(sv);
return 0;
Expand Down
6 changes: 3 additions & 3 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ _PyEval_MatchClass(PyThreadState *tstate, PyObject *subject, PyObject *type,
}
if (match_self) {
// Easy. Copy the subject itself, and move on to kwargs.
assert(PyTuple_GET_ITEM(attrs, 0) == NULL);
assert(PyTuple_GET_ITEM(attrs, 0) == Py_None);
PyTuple_SET_ITEM(attrs, 0, Py_NewRef(subject));
}
else {
Expand All @@ -621,7 +621,7 @@ _PyEval_MatchClass(PyThreadState *tstate, PyObject *subject, PyObject *type,
if (attr == NULL) {
goto fail;
}
assert(PyTuple_GET_ITEM(attrs, i) == NULL);
assert(PyTuple_GET_ITEM(attrs, i) == Py_None);
PyTuple_SET_ITEM(attrs, i, attr);
}
}
Expand All @@ -634,7 +634,7 @@ _PyEval_MatchClass(PyThreadState *tstate, PyObject *subject, PyObject *type,
if (attr == NULL) {
goto fail;
}
assert(PyTuple_GET_ITEM(attrs, nargs + i) == NULL);
assert(PyTuple_GET_ITEM(attrs, nargs + i) == Py_None);
PyTuple_SET_ITEM(attrs, nargs + i, attr);
}
Py_XDECREF(seen);
Expand Down
Loading