Merge 3.5 (fix refleak in call_method)

59e9ca6b · Victor Stinner · a7720f61 · d925bd57 · 59e9ca6b
Commit 59e9ca6b authored Aug 19, 2016 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Objects/typeobject.c Objects/typeobject.c +3 -1

No files found.
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1442,8 +1442,10 @@ call_method(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);