summaryrefslogtreecommitdiffstats
path: root/Modules/_pickle.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2022-11-22 13:22:22 (GMT)
committerGitHub <noreply@github.com>2022-11-22 13:22:22 (GMT)
commit7e3f09cad9b783d8968aa79ff6a8ee57beb8b83e (patch)
treea8d4dda9e9128545442794595f5ebc96a5c1c7b4 /Modules/_pickle.c
parent135ec7cefbaffd516b77362ad2b2ad1025af462e (diff)
downloadcpython-7e3f09cad9b783d8968aa79ff6a8ee57beb8b83e.zip
cpython-7e3f09cad9b783d8968aa79ff6a8ee57beb8b83e.tar.gz
cpython-7e3f09cad9b783d8968aa79ff6a8ee57beb8b83e.tar.bz2
gh-99537: Use Py_SETREF() function in C code (#99656)
Fix potential race condition in code patterns: * Replace "Py_DECREF(var); var = new;" with "Py_SETREF(var, new);" * Replace "Py_XDECREF(var); var = new;" with "Py_XSETREF(var, new);" * Replace "Py_CLEAR(var); var = new;" with "Py_XSETREF(var, new);" Other changes: * Replace "old = var; var = new; Py_DECREF(var)" with "Py_SETREF(var, new);" * Replace "old = var; var = new; Py_XDECREF(var)" with "Py_XSETREF(var, new);" * And remove the "old" variable.
Diffstat (limited to 'Modules/_pickle.c')
-rw-r--r--Modules/_pickle.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index db62094..1e118e9 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -1829,8 +1829,7 @@ get_deep_attribute(PyObject *obj, PyObject *names, PyObject **pparent)
n = PyList_GET_SIZE(names);
for (i = 0; i < n; i++) {
PyObject *name = PyList_GET_ITEM(names, i);
- Py_XDECREF(parent);
- parent = obj;
+ Py_XSETREF(parent, obj);
(void)_PyObject_LookupAttr(parent, name, &obj);
if (obj == NULL) {
Py_DECREF(parent);
@@ -3717,9 +3716,7 @@ save_global(PicklerObject *self, PyObject *obj, PyObject *name)
else {
gen_global:
if (parent == module) {
- Py_INCREF(lastname);
- Py_DECREF(global_name);
- global_name = lastname;
+ Py_SETREF(global_name, Py_NewRef(lastname));
}
if (self->proto >= 4) {
const char stack_global_op = STACK_GLOBAL;