diff options
author | Jörg Stucke <joerg.stucke@fkie.fraunhofer.de> | 2019-05-21 17:44:40 (GMT) |
---|---|---|
committer | Antoine Pitrou <antoine@python.org> | 2019-05-21 17:44:40 (GMT) |
commit | d5c120f7eb6f2a9cdab282a5d588afed307a23df (patch) | |
tree | 60b1882411bd299e6d2332185a099ba3ee3af56a /Lib/pathlib.py | |
parent | ccb7ca728e09b307f9e9fd36ec40353137e68a3b (diff) | |
download | cpython-d5c120f7eb6f2a9cdab282a5d588afed307a23df.zip cpython-d5c120f7eb6f2a9cdab282a5d588afed307a23df.tar.gz cpython-d5c120f7eb6f2a9cdab282a5d588afed307a23df.tar.bz2 |
bpo-36035: fix Path.rglob for broken links (GH-11988)
Links creating an infinite symlink loop would raise an exception.
Diffstat (limited to 'Lib/pathlib.py')
-rw-r--r-- | Lib/pathlib.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Lib/pathlib.py b/Lib/pathlib.py index b5bab1f..6369c4b 100644 --- a/Lib/pathlib.py +++ b/Lib/pathlib.py @@ -7,7 +7,7 @@ import posixpath import re import sys from _collections_abc import Sequence -from errno import EINVAL, ENOENT, ENOTDIR, EBADF +from errno import EINVAL, ENOENT, ENOTDIR, EBADF, ELOOP from operator import attrgetter from stat import S_ISDIR, S_ISLNK, S_ISREG, S_ISSOCK, S_ISBLK, S_ISCHR, S_ISFIFO from urllib.parse import quote_from_bytes as urlquote_from_bytes @@ -35,10 +35,11 @@ __all__ = [ # # EBADF - guard against macOS `stat` throwing EBADF -_IGNORED_ERROS = (ENOENT, ENOTDIR, EBADF) +_IGNORED_ERROS = (ENOENT, ENOTDIR, EBADF, ELOOP) _IGNORED_WINERRORS = ( 21, # ERROR_NOT_READY - drive exists but is not accessible + 1921, # ERROR_CANT_RESOLVE_FILENAME - fix for broken symlink pointing to itself ) def _ignore_error(exception): @@ -520,7 +521,13 @@ class _WildcardSelector(_Selector): cf = parent_path._flavour.casefold entries = list(scandir(parent_path)) for entry in entries: - if not self.dironly or entry.is_dir(): + entry_is_dir = False + try: + entry_is_dir = entry.is_dir() + except OSError as e: + if not _ignore_error(e): + raise + if not self.dironly or entry_is_dir: name = entry.name casefolded = cf(name) if self.pat.match(casefolded): |