mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Issue #21802: The reader in BufferedRWPair now is closed even when closing

Browse source 
writer failed in BufferedRWPair.close().
This commit is contained in:
Serhiy Storchaka 2015-03-24 23:21:57 +02:00
parent 8ffe917cee
commit 7665be6087
4 changed files with 64 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_io/bufferedio.c
View file

@ -2365,12 +2365,18 @@ bufferedrwpair_writable(rwpair *self, PyObject *args)
static PyObject *
bufferedrwpair_close(rwpair *self, PyObject *args)
{
PyObject *exc = NULL, *val, *tb;
PyObject *ret = _forward_call(self->writer, &PyId_close, args);
if (ret == NULL)
return NULL;
Py_DECREF(ret);
return _forward_call(self->reader, &PyId_close, args);
PyErr_Fetch(&exc, &val, &tb);
else
Py_DECREF(ret);
ret = _forward_call(self->reader, &PyId_close, args);
if (exc != NULL) {
_PyErr_ChainExceptions(exc, val, tb);
Py_CLEAR(ret);
}
return ret;
}
static PyObject *