diff options
| author | Nir Soffer <nirsof@gmail.com> | 2017-07-24 21:18:06 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-07-24 21:18:06 (GMT) |
| commit | c648a93ae342ac28d2abbb100161eae4f907d001 (patch) | |
| tree | fe57c9a1fbed51dbfd1d32b3bc73fcb0edfc5756 /Lib/asyncore.py | |
| parent | 5b4feb7e86ecb813b2c56560f86cda2fd46b9579 (diff) | |
| download | cpython-c648a93ae342ac28d2abbb100161eae4f907d001.zip cpython-c648a93ae342ac28d2abbb100161eae4f907d001.tar.gz cpython-c648a93ae342ac28d2abbb100161eae4f907d001.tar.bz2 | |
bpo-30980: Fix double close in asyncore.file_wrapper (#2789)
* bpo-30980: Fix close test to fail
test_close_twice was not considering the fact that file_wrapper is
duping the file descriptor. Closing the original descriptor left the
duped one open, hiding the fact that close protection is not effective.
* bpo-30980: Fix double close protection
Invalidated self.fd before closing, handling correctly the case when
os.close raises.
* bpo-30980: Fix fd leak introduced in the fixed test
Diffstat (limited to 'Lib/asyncore.py')
| -rw-r--r-- | Lib/asyncore.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 705e406..03d1683 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -619,8 +619,9 @@ if os.name == 'posix': def close(self): if self.fd < 0: return - os.close(self.fd) + fd = self.fd self.fd = -1 + os.close(fd) def fileno(self): return self.fd |