From 81f241ab2e19db9e421a300c00f9fb1c4e0003df Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 25 Mar 2015 02:25:25 +0100 Subject: Issue #23571: If io.TextIOWrapper constructor fails in _Py_DisplaySourceLine(), close the binary file to fix a resource warning. --- Python/traceback.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Python/traceback.c b/Python/traceback.c index c2aba52..2bea29e 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -309,13 +309,20 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent) } fob = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "Os", binary, encoding); Py_DECREF(io); - Py_DECREF(binary); PyMem_FREE(found_encoding); if (fob == NULL) { PyErr_Clear(); + + res = _PyObject_CallMethodId(binary, &PyId_close, ""); + Py_DECREF(binary); + if (res) + Py_DECREF(res); + else + PyErr_Clear(); return 0; } + Py_DECREF(binary); /* get the line number lineno */ for (i = 0; i < lineno; i++) { -- cgit v0.12