diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-09 11:46:20 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-02-09 11:46:20 (GMT) |
| commit | dfe98a102ec8723d750f78ecda08a7adb9360eb1 (patch) | |
| tree | f8aea8fb3d74be18ed67a2f4e0a355ad9beb42d8 /Objects/tupleobject.c | |
| parent | 2623c8c23cead505a78ec416072223552e94727e (diff) | |
| parent | 505ff755d704c73ac613d3e8fed02c79c6ae555a (diff) | |
| download | cpython-dfe98a102ec8723d750f78ecda08a7adb9360eb1.zip cpython-dfe98a102ec8723d750f78ecda08a7adb9360eb1.tar.gz cpython-dfe98a102ec8723d750f78ecda08a7adb9360eb1.tar.bz2 | |
Issue #20437: Fixed 22 potential bugs when deleting objects references.
Diffstat (limited to 'Objects/tupleobject.c')
| -rw-r--r-- | Objects/tupleobject.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 5625a65..c63afcc 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -879,8 +879,7 @@ _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize) _Py_ForgetReference((PyObject *) v); /* DECREF items deleted by shrinkage */ for (i = newsize; i < oldsize; i++) { - Py_XDECREF(v->ob_item[i]); - v->ob_item[i] = NULL; + Py_CLEAR(v->ob_item[i]); } sv = PyObject_GC_Resize(PyTupleObject, v, newsize); if (sv == NULL) { @@ -926,8 +925,7 @@ PyTuple_Fini(void) #if PyTuple_MAXSAVESIZE > 0 /* empty tuples are used all over the place and applications may * rely on the fact that an empty tuple is a singleton. */ - Py_XDECREF(free_list[0]); - free_list[0] = NULL; + Py_CLEAR(free_list[0]); (void)PyTuple_ClearFreeList(); #endif |