mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-24 09:23:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #23571: If io.TextIOWrapper constructor fails in _Py_DisplaySourceLine(),

Browse source 
close the binary file to fix a resource warning.
This commit is contained in:
Victor Stinner 2015-03-25 02:25:25 +01:00
parent 84092ac370
commit 81f241ab2e
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/traceback.c
View file

@ -309,13 +309,20 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
} }
fob = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "Os", binary, encoding); fob = _PyObject_CallMethodId(io, &PyId_TextIOWrapper, "Os", binary, encoding);
Py_DECREF(io); Py_DECREF(io);
Py_DECREF(binary);
PyMem_FREE(found_encoding); PyMem_FREE(found_encoding);
if (fob == NULL) { if (fob == NULL) {
PyErr_Clear(); PyErr_Clear();
res = _PyObject_CallMethodId(binary, &PyId_close, "");
Py_DECREF(binary);
if (res)
Py_DECREF(res);
else
PyErr_Clear();
return 0; return 0;
} }
Py_DECREF(binary);
/* get the line number lineno */ /* get the line number lineno */
for (i = 0; i < lineno; i++) { for (i = 0; i < lineno; i++) {