From 3b9b9bab3dcbcaa280dea39c84118a74946e74ba Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 23 Apr 2010 23:33:50 +0000 Subject: [PATCH] Merged revisions 80429 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80429 | antoine.pitrou | 2010-04-24 01:31:47 +0200 (sam., 24 avril 2010) | 13 lines Note: I'm just merging in the additional test. Merged revisions 80428 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80428 | antoine.pitrou | 2010-04-24 01:25:45 +0200 (sam., 24 avril 2010) | 4 lines Issue #5238: Calling makefile() on an SSL object would prevent the underlying socket from being closed until all objects get truely destroyed. ........ ................ --- Lib/test/test_ssl.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index eab15ab61a..19e7cb849c 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -8,7 +8,9 @@ import select import errno import subprocess import time +import gc import os +import errno import pprint import urllib.parse, urllib.request import shutil @@ -108,6 +110,25 @@ class BasicTests(unittest.TestCase): del ss self.assertEqual(wr(), None) + def test_makefile_close(self): + # Issue #5238: creating a file-like object with makefile() shouldn't + # leak the underlying file descriptor. + ss = ssl.wrap_socket(socket.socket(socket.AF_INET)) + fd = ss.fileno() + f = ss.makefile() + f.close() + # The fd is still open + os.read(fd, 0) + # Closing the SSL socket should close the fd too + ss.close() + gc.collect() + try: + os.read(fd, 0) + except OSError as e: + self.assertEqual(e.errno, errno.EBADF) + else: + self.fail("OSError wasn't raised") + class NetworkedTests(unittest.TestCase): def testConnect(self): -- 2.40.0