From: Benjamin Peterson Date: Sat, 5 Jul 2014 00:00:25 +0000 (-0700) Subject: properly decref the return value of close() X-Git-Tag: v3.5.0a1~1347 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f654fbe3023caf1b163f7db3064f58921522468;p=python properly decref the return value of close() --- diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 9e14b4ff40..6f7af41382 100644 --- a/Modules/_io/_iomodule.c +++ b/Modules/_io/_iomodule.c @@ -455,11 +455,13 @@ io_open(PyObject *self, PyObject *args, PyObject *kwds) error: if (result != NULL) { - PyObject *exc, *val, *tb; + PyObject *exc, *val, *tb, *close_result; PyErr_Fetch(&exc, &val, &tb); - if (_PyObject_CallMethodId(result, &PyId_close, NULL) != NULL) + close_result = _PyObject_CallMethodId(result, &PyId_close, NULL); + if (close_result != NULL) { + Py_DECREF(close_result); PyErr_Restore(exc, val, tb); - else { + } else { PyObject *exc2, *val2, *tb2; PyErr_Fetch(&exc2, &val2, &tb2); PyErr_NormalizeException(&exc, &val, &tb);