summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-07-03 13:47:40 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2006-07-03 13:47:40 (GMT)
commitd5cfa5491a7a7c23fa31bf2262d00fcaf4b7474d (patch)
tree9ae965d962e4328564b993839bfaa4c87cf98a4e /Objects
parentede77f5373e38ce1befc02858dcbcff8214c061b (diff)
downloadcpython-d5cfa5491a7a7c23fa31bf2262d00fcaf4b7474d.zip
cpython-d5cfa5491a7a7c23fa31bf2262d00fcaf4b7474d.tar.gz
cpython-d5cfa5491a7a7c23fa31bf2262d00fcaf4b7474d.tar.bz2
Put method-wrappers into trashcan. Fixes #927248.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/descrobject.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 606ef05..51676f6 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -892,10 +892,12 @@ typedef struct {
static void
wrapper_dealloc(wrapperobject *wp)
{
- _PyObject_GC_UNTRACK(wp);
+ PyObject_GC_UnTrack(wp);
+ Py_TRASHCAN_SAFE_BEGIN(wp)
Py_XDECREF(wp->descr);
Py_XDECREF(wp->self);
PyObject_GC_Del(wp);
+ Py_TRASHCAN_SAFE_END(wp)
}
static int