Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.11] gh-110237: Check PyList_Append for errors in _PyEval_MatchClass (GH-110238) (#110512)

Browse source 
gh-110237: Check `PyList_Append` for errors in `_PyEval_MatchClass` (GH-110238)
(cherry picked from commit dd9d781da3)

Co-authored-by: denballakh <47365157+denballakh@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2023-10-07 17:29:46 -07:00 • committed by GitHub
parent af168df78f
commit f21c09ca03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2023-10-02-23-17-08.gh-issue-110237._Xub0z.rst Normal file
View file

@ -0,0 +1 @@
Fix missing error checks for calls to ``PyList_Append`` in ``_PyEval_MatchClass``.

14
Python/ceval.c
View file

@ -1060,7 +1060,9 @@ match_class(PyThreadState *tstate, PyObject *subject, PyObject *type,
} }
if (match_self) { if (match_self) {
// Easy. Copy the subject itself, and move on to kwargs. // Easy. Copy the subject itself, and move on to kwargs.
PyList_Append(attrs, subject); if (PyList_Append(attrs, subject) < 0) {
goto fail;
}
} }
else { else {
for (Py_ssize_t i = 0; i < nargs; i++) { for (Py_ssize_t i = 0; i < nargs; i++) {
@ -1076,7 +1078,10 @@ match_class(PyThreadState *tstate, PyObject *subject, PyObject *type,
if (attr == NULL) { if (attr == NULL) {
goto fail; goto fail;
} }
PyList_Append(attrs, attr); if (PyList_Append(attrs, attr) < 0) {
Py_DECREF(attr);
goto fail;
}
Py_DECREF(attr); Py_DECREF(attr);
} }
} }
@ -1089,7 +1094,10 @@ match_class(PyThreadState *tstate, PyObject *subject, PyObject *type,
if (attr == NULL) { if (attr == NULL) {
goto fail; goto fail;
} }
PyList_Append(attrs, attr); if (PyList_Append(attrs, attr) < 0) {
Py_DECREF(attr);
goto fail;
}
Py_DECREF(attr); Py_DECREF(attr);
} }
Py_SETREF(attrs, PyList_AsTuple(attrs)); Py_SETREF(attrs, PyList_AsTuple(attrs));