mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-110235: Raise TypeError for duplicate/unknown fields in PyStructSequence constructor (GH-110258)

Browse source
This commit is contained in:
Xuehai Pan 2023-10-05 00:44:17 +08:00 • committed by GitHub
parent bf4bc36069
commit 9561648f4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 84 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Objects/structseq.c
View file

@ -216,19 +216,34 @@ structseq_new_impl(PyTypeObject *type, PyObject *arg, PyObject *dict)
res->ob_item[i] = Py_NewRef(v);
}
Py_DECREF(arg);
for (; i < max_len; ++i) {
PyObject *ob = NULL;
if (dict != NULL) {
const char *name = type->tp_members[i-n_unnamed_fields].name;
if (dict != NULL && PyDict_GET_SIZE(dict) > 0) {
Py_ssize_t n_found_keys = 0;
for (i = len; i < max_len; ++i) {
PyObject *ob = NULL;
const char *name = type->tp_members[i - n_unnamed_fields].name;
if (PyDict_GetItemStringRef(dict, name, &ob) < 0) {
Py_DECREF(res);
return NULL;
}
if (ob == NULL) {
ob = Py_NewRef(Py_None);
}
else {
++n_found_keys;
}
res->ob_item[i] = ob;
}
if (ob == NULL) {
ob = Py_NewRef(Py_None);
if (PyDict_GET_SIZE(dict) > n_found_keys) {
PyErr_Format(PyExc_TypeError,
"%.500s() got duplicate or unexpected field name(s)",
type->tp_name);
Py_DECREF(res);
return NULL;
}
} else {
for (i = len; i < max_len; ++i) {
res->ob_item[i] = Py_NewRef(Py_None);
}
res->ob_item[i] = ob;
}
_PyObject_GC_TRACK(res);