mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source 
pointer.
This commit is contained in:
Serhiy Storchaka 2016-05-04 21:42:52 +03:00
commit fcce462e9c
2 changed files with 18 additions and 15 deletions
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 Core and Builtins
----------------- -----------------
- Issue #26811: gc.get_objects() no longer contains a broken tuple with NULL
pointer.
- Issue #20120: Use RawConfigParser for .pypirc parsing, - Issue #20120: Use RawConfigParser for .pypirc parsing,
removing support for interpolation unintentionally added removing support for interpolation unintentionally added
with move to Python 3. Behavior no longer does any with move to Python 3. Behavior no longer does any

26
Objects/descrobject.c
View file

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