summaryrefslogtreecommitdiffstats
path: root/Objects/typeobject.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-08-19 15:58:30 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-08-19 15:58:30 (GMT)
commit56142c701b90c68a2a37fc23b0d7ba66c25fc3b4 (patch)
tree12fbf23276b77fcff479a0280d7af0d7cc3923cf /Objects/typeobject.c
parentf2abf5c11a98bc341add7a695757564a186a45d6 (diff)
parent6902ddf2cab4900fa01248c313e7d4a7e67d97f7 (diff)
downloadcpython-56142c701b90c68a2a37fc23b0d7ba66c25fc3b4.zip
cpython-56142c701b90c68a2a37fc23b0d7ba66c25fc3b4.tar.gz
cpython-56142c701b90c68a2a37fc23b0d7ba66c25fc3b4.tar.bz2
Merge 3.5 (fix refleak in call_maybe())
Diffstat (limited to 'Objects/typeobject.c')
-rw-r--r--Objects/typeobject.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 9d77a5d..0440180 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1480,8 +1480,10 @@ call_maybe(PyObject *o, _Py_Identifier *nameid, const char *format, ...)
va_end(va);
- if (args == NULL)
+ if (args == NULL) {
+ Py_DECREF(func);
return NULL;
+ }
assert(PyTuple_Check(args));
retval = PyObject_Call(func, args, NULL);