[Python-checkins] bpo-44482: Fix very unlikely resource leak in glob in non-CPython implementations (GH-26843)

[serhiy-storchaka]

https://github.com/python/cpython/commit/5c7940257e1f611e7284fd504887bd29a63d0a94
commit: 5c7940257e1f611e7284fd504887bd29a63d0a94
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2021-06-23T12:53:37+03:00
summary:

bpo-44482: Fix very unlikely resource leak in glob in non-CPython implementations (GH-26843)

files:
A Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst
M Lib/glob.py

diff --git a/Lib/glob.py b/Lib/glob.py
index a6cff87350826..9fc08f45df115 100644
--- a/Lib/glob.py
+++ b/Lib/glob.py
@@ -1,5 +1,6 @@
 """Filename globbing utility."""
 
+import contextlib
 import os
 import re
 import fnmatch
@@ -90,7 +91,7 @@ def _iglob(pathname, root_dir, dir_fd, recursive, dironly):
 # takes a literal basename (so it only has to check for its existence).
 
 def _glob1(dirname, pattern, dir_fd, dironly):
-    names = list(_iterdir(dirname, dir_fd, dironly))
+    names = _listdir(dirname, dir_fd, dironly)
     if not _ishidden(pattern):
         names = (x for x in names if not _ishidden(x))
     return fnmatch.filter(names, pattern)
@@ -158,9 +159,13 @@ def _iterdir(dirname, dir_fd, dironly):
     except OSError:
         return
 
+def _listdir(dirname, dir_fd, dironly):
+    with contextlib.closing(_iterdir(dirname, dir_fd, dironly)) as it:
+        return list(it)
+
 # Recursively yields relative pathnames inside a literal directory.
 def _rlistdir(dirname, dir_fd, dironly):
-    names = list(_iterdir(dirname, dir_fd, dironly))
+    names = _listdir(dirname, dir_fd, 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
index 0000000000000..d05fe908e3eba
--- /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.