Skip to content

bpo-30980: Fix double close in asyncore.file_wrapper #2789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 3 commits into from
Jul 24, 2017
Merged

bpo-30980: Fix double close in asyncore.file_wrapper #2789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4a760e
bpo-30980: Fix close test to fail
nirs Jul 20, 2017
bd4b398
bpo-30980: Fix double close protection
nirs Jul 20, 2017
e4f25d5
bpo-30980: Fix fd leak introduced in the fixed test
nirs Jul 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Lib/asyncore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,9 @@ def getsockopt(self, level, optname, buflen=None):
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
Expand Down
5 changes: 4 additions & 1 deletion Lib/test/test_asyncore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,10 @@ def test_close_twice(self):
f = asyncore.file_wrapper(fd)
os.close(fd)

f.close()
os.close(f.fd) # file_wrapper dupped fd
with self.assertRaises(OSError):
f.close()
Copy link
Copy Markdown
Member

@vstinner vstinner Jul 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add this test here:

self.assertEqual(f.fileno(), -1)

To test your fix.


self.assertEqual(f.fd, -1)
Copy link
Copy Markdown
Contributor Author

@nirs nirs Jul 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Haypo isn't this ^^^^ good enough?

Since file_wrapper.fd is not documented, maybe we should replace f.fd with f.fileno()? Do you want to add this change to the patch?

Copy link
Copy Markdown
Member

@vstinner vstinner Jul 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I missed it :-) It's enough.

# calling close twice should not fail
f.close()
Expand Down