Issue #21802: The reader in BufferedRWPair now is closed even when closing
writer failed in BufferedRWPair.close().
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 02cf038..445c870 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -2365,12 +2365,18 @@
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 *