mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 09:15:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

gh-99537: Use Py_SETREF(var, NULL) in C code (#99687)

Browse source 
Replace "Py_DECREF(var); var = NULL;" with "Py_SETREF(var, NULL);".
This commit is contained in:
Victor Stinner 2022-11-23 14:57:50 +01:00 • committed by GitHub
parent 5d9183c7ad
commit 81f7359f67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 44 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/bltinmodule.c
View file

@ -218,8 +218,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
"__class__ set to %.200R defining %.200R as %.200R";
PyErr_Format(PyExc_TypeError, msg, cell_cls, name, cls);
}
Py_DECREF(cls);
cls = NULL;
Py_SETREF(cls, NULL);
goto error;
}
}
@ -2483,8 +2482,7 @@ builtin_sum_impl(PyObject *module, PyObject *iterable, PyObject *start)
long i_result = PyLong_AsLongAndOverflow(result, &overflow);
/* If this already overflowed, don't even enter the loop. */
if (overflow == 0) {
Py_DECREF(result);
result = NULL;
Py_SETREF(result, NULL);
}
while(result == NULL) {
item = PyIter_Next(iter);
@ -2534,8 +2532,7 @@ builtin_sum_impl(PyObject *module, PyObject *iterable, PyObject *start)
if (PyFloat_CheckExact(result)) {
double f_result = PyFloat_AS_DOUBLE(result);
Py_DECREF(result);
result = NULL;
Py_SETREF(result, NULL);
while(result == NULL) {
item = PyIter_Next(iter);
if (item == NULL) {
@ -2582,8 +2579,7 @@ builtin_sum_impl(PyObject *module, PyObject *iterable, PyObject *start)
if (item == NULL) {
/* error, or end-of-sequence */
if (PyErr_Occurred()) {
Py_DECREF(result);
result = NULL;
Py_SETREF(result, NULL);
}
break;
}

3
Python/errors.c
View file

@ -37,8 +37,7 @@ _PyErr_Restore(PyThreadState *tstate, PyObject *type, PyObject *value,
if (traceback != NULL && !PyTraceBack_Check(traceback)) {
/* XXX Should never happen -- fatal error instead? */
/* Well, it could be None. */
Py_DECREF(traceback);
traceback = NULL;
Py_SETREF(traceback, NULL);
}
/* Save these in locals to safeguard against recursive

12
Python/marshal.c
View file

@ -1217,8 +1217,7 @@ r_object(RFILE *p)
if (!PyErr_Occurred())
PyErr_SetString(PyExc_TypeError,
"NULL object in marshal data for tuple");
Py_DECREF(v);
v = NULL;
Py_SETREF(v, NULL);
break;
}
PyTuple_SET_ITEM(v, i, v2);
@ -1244,8 +1243,7 @@ r_object(RFILE *p)
if (!PyErr_Occurred())
PyErr_SetString(PyExc_TypeError,
"NULL object in marshal data for list");
Py_DECREF(v);
v = NULL;
Py_SETREF(v, NULL);
break;
}
PyList_SET_ITEM(v, i, v2);
@ -1277,8 +1275,7 @@ r_object(RFILE *p)
Py_DECREF(val);
}
if (PyErr_Occurred()) {
Py_DECREF(v);
v = NULL;
Py_SETREF(v, NULL);
}
retval = v;
break;
@ -1322,8 +1319,7 @@ r_object(RFILE *p)
if (!PyErr_Occurred())
PyErr_SetString(PyExc_TypeError,
"NULL object in marshal data for set");
Py_DECREF(v);
v = NULL;
Py_SETREF(v, NULL);
break;
}
if (PySet_Add(v, v2) == -1) {