Issue #5238: Calling makefile() on an SSL object would prevent the

underlying socket from being closed until all objects get truely destroyed.

1 files changed, 18 insertions, 0 deletions

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 5917b51..c418cd4 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -7,7 +7,9 @@ import asyncore
 import socket
 import select
 import time
+import gc
 import os
+import errno
 import pprint
 import urllib, urlparse
 import traceback
@@ -165,6 +167,22 @@ 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()
+        with self.assertRaises(OSError) as e:
+            os.read(fd, 0)
+        self.assertEqual(e.exception.errno, errno.EBADF)
+
 
 class NetworkedTests(unittest.TestCase):