[3.9] bpo-44482: Fix very unlikely resource leak in glob in non-CPython implementatio...

(cherry picked from commit 5c7940257e1f611e7284fd504887bd29a63d0a94)

diff --git a/Lib/glob.py b/Lib/glob.py
index 0dd2f8be6610945c27abc4bab25c06fcf58dac60..123706113095156350104a21d4f1997292b2f85c 100644 (file)
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -1,5 +1,6 @@
 """Filename globbing utility."""
 
+import contextlib
 import os
 import re
 import fnmatch
@@ -79,7 +80,7 @@ def _iglob(pathname, recursive, dironly):
 # takes a literal basename (so it only has to check for its existence).
 
 def _glob1(dirname, pattern, dironly):
-    names = list(_iterdir(dirname, dironly))
+    names = _listdir(dirname, dironly)
     if not _ishidden(pattern):
         names = (x for x in names if not _ishidden(x))
     return fnmatch.filter(names, pattern)
@@ -130,9 +131,13 @@ def _iterdir(dirname, dironly):
     except OSError:
         return
 
+def _listdir(dirname, dironly):
+    with contextlib.closing(_iterdir(dirname, dironly)) as it:
+        return list(it)
+
 # Recursively yields relative pathnames inside a literal directory.
 def _rlistdir(dirname, dironly):
-    names = list(_iterdir(dirname, dironly))
+    names = _listdir(dirname, dironly)
     for x in names:
         if not _ishidden(x):
             yield x

diff --git a/Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst b/Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst
new file mode 100644 (file)
index 0000000..d05fe90
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst
@@ -0,0 +1,2 @@
+Fix very unlikely resource leak in :mod:`glob` in alternate Python
+implementations.