Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #26811: gc.get_objects() no longer contains a broken tuple with NULL 

pointer.
This commit is contained in:
Serhiy Storchaka 2016-05-04 21:42:05 +03:00
parent 422cf2b4ad
commit 7822f151b6
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ Release date: tba
Core and Builtins
-----------------
- Issue #26811: gc.get_objects() no longer contains a broken tuple with NULL
pointer.
- Issue #20120: Use RawConfigParser for .pypirc parsing,
removing support for interpolation unintentionally added
with move to Python 3. Behavior no longer does any

30
Objects/descrobject.c
View File

@ -1386,27 +1386,27 @@ property_descr_get(PyObject *self, PyObject *obj, PyObject *type)
return NULL;
}
args = cached_args;
if (!args || Py_REFCNT(args) != 1) {
Py_CLEAR(cached_args);
if (!(cached_args = args = PyTuple_New(1)))
cached_args = NULL;
if (!args) {
args = PyTuple_New(1);
if (!args)
return NULL;
_PyObject_GC_UNTRACK(args);
}
Py_INCREF(args);
assert (Py_REFCNT(args) == 2);
Py_INCREF(obj);
PyTuple_SET_ITEM(args, 0, obj);
ret = PyObject_Call(gs->prop_get, args, NULL);
if (args == cached_args) {
if (Py_REFCNT(args) == 2) {
obj = PyTuple_GET_ITEM(args, 0);
PyTuple_SET_ITEM(args, 0, NULL);
Py_XDECREF(obj);
}
else {
Py_CLEAR(cached_args);
}
if (cached_args == NULL && Py_REFCNT(args) == 1) {
assert(Py_SIZE(args) == 1);
assert(PyTuple_GET_ITEM(args, 0) == obj);
cached_args = args;
Py_DECREF(obj);
}
else {
assert(Py_REFCNT(args) >= 1);
_PyObject_GC_TRACK(args);
Py_DECREF(args);
}
Py_DECREF(args);
return ret;
}