mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 20:28:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-31976: Fix race condition when flushing a file is slow. (#4331)

Browse source
This commit is contained in:
benfogle 2017-11-10 16:03:40 -05:00 • committed by Antoine Pitrou
parent 4652bf2acc
commit 9703f092ab
4 changed files with 58 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_io/bufferedio.c
View file

@ -347,9 +347,10 @@ _enter_buffered_busy(buffered *self)
}
#define IS_CLOSED(self) \
(!self->buffer || \
(self->fast_closed_checks \
? _PyFileIO_closed(self->raw) \
: buffered_closed(self))
: buffered_closed(self)))
#define CHECK_CLOSED(self, error_msg) \
if (IS_CLOSED(self)) { \
@ -1971,14 +1972,17 @@ _io_BufferedWriter_write_impl(buffered *self, Py_buffer *buffer)
Py_off_t offset;
CHECK_INITIALIZED(self)
if (IS_CLOSED(self)) {
PyErr_SetString(PyExc_ValueError, "write to closed file");
return NULL;
}
if (!ENTER_BUFFERED(self))
return NULL;
/* Issue #31976: Check for closed file after acquiring the lock. Another
thread could be holding the lock while closing the file. */
if (IS_CLOSED(self)) {
PyErr_SetString(PyExc_ValueError, "write to closed file");
goto error;
}
/* Fast path: the data to write can be fully buffered. */
if (!VALID_READ_BUFFER(self) && !VALID_WRITE_BUFFER(self)) {
self->pos = 0;