Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Serhiy Storchaka 2021-06-23 12:53:37 +03:00 committed by GitHub
parent 5a3108044d
commit 5c7940257e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/glob.py
View File

@ -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

2
Misc/NEWS.d/next/Library/2021-06-22-08-43-04.bpo-44482.U9GznK.rst Normal file
View File

@ -0,0 +1,2 @@
Fix very unlikely resource leak in :mod:`glob` in alternate Python
implementations.