diff options
author | Victor Stinner <vstinner@python.org> | 2023-06-28 01:45:57 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-28 01:45:57 (GMT) |
commit | 3f8483cad2f3b94600c3ecf3f0bb220bb1e61d7d (patch) | |
tree | d2a68be122484d443ab9260b2b542a9c509defe1 /Objects/structseq.c | |
parent | 161012fc25910a47423bae8012398bf519a88140 (diff) | |
download | cpython-3f8483cad2f3b94600c3ecf3f0bb220bb1e61d7d.zip cpython-3f8483cad2f3b94600c3ecf3f0bb220bb1e61d7d.tar.gz cpython-3f8483cad2f3b94600c3ecf3f0bb220bb1e61d7d.tar.bz2 |
gh-106168: PyTuple_SET_ITEM() now checks the index (#106164)
PyTuple_SET_ITEM() and PyList_SET_ITEM() now check the index argument
with an assertion if Python is built in debug mode or is built with
assertions.
* list_extend() and _PyList_AppendTakeRef() now set the list size
before calling PyList_SET_ITEM().
* PyStructSequence_GetItem() and PyStructSequence_SetItem() now check
the index argument: must be lesser than REAL_SIZE(op).
* PyStructSequence_GET_ITEM() and PyStructSequence_SET_ITEM() are now
aliases to PyStructSequence_GetItem() and
PyStructSequence_SetItem().
Diffstat (limited to 'Objects/structseq.c')
-rw-r--r-- | Objects/structseq.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/Objects/structseq.c b/Objects/structseq.c index 8b18959..4901113 100644 --- a/Objects/structseq.c +++ b/Objects/structseq.c @@ -74,15 +74,28 @@ PyStructSequence_New(PyTypeObject *type) } void -PyStructSequence_SetItem(PyObject* op, Py_ssize_t i, PyObject* v) +PyStructSequence_SetItem(PyObject *op, Py_ssize_t index, PyObject *value) { - PyStructSequence_SET_ITEM(op, i, v); + PyTupleObject *tuple = _PyTuple_CAST(op); + assert(0 <= index); +#ifndef NDEBUG + Py_ssize_t n_fields = REAL_SIZE(op); + assert(n_fields >= 0); + assert(index < n_fields); +#endif + tuple->ob_item[index] = value; } PyObject* -PyStructSequence_GetItem(PyObject* op, Py_ssize_t i) +PyStructSequence_GetItem(PyObject *op, Py_ssize_t index) { - return PyStructSequence_GET_ITEM(op, i); + assert(0 <= index); +#ifndef NDEBUG + Py_ssize_t n_fields = REAL_SIZE(op); + assert(n_fields >= 0); + assert(index < n_fields); +#endif + return PyTuple_GET_ITEM(op, index); } @@ -287,7 +300,7 @@ structseq_repr(PyStructSequence *obj) goto error; } - PyObject *value = PyStructSequence_GET_ITEM(obj, i); + PyObject *value = PyStructSequence_GetItem((PyObject*)obj, i); assert(value != NULL); PyObject *repr = PyObject_Repr(value); if (repr == NULL) { |