From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 10 May 2023 23:19:49 +0000 (-0700)
Subject: [3.11] GH-87695: Fix OSError from `pathlib.Path.glob()` (GH-104292) (GH-104362)
X-Git-Tag: v3.11.4~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=846a23d0b8f08e62a90682c51ce01301eb923f2e;p=thirdparty%2FPython%2Fcpython.git

[3.11] GH-87695: Fix OSError from `pathlib.Path.glob()` (GH-104292) (GH-104362)

Fix issue where `pathlib.Path.glob()` raised `OSError` when it encountered
a symlink to an overly long path.
(cherry picked from commit a33ce66dca57d4c36b1022fdf3b7e322f3203468)

Co-authored-by: Barney Gale <barney.gale@gmail.com>
---

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 9d40d88ef5f2..ecb1e8a40d8c 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -388,11 +388,11 @@ class _RecursiveWildcardSelector(_Selector):
             for entry in entries:
                 entry_is_dir = False
                 try:
-                    entry_is_dir = entry.is_dir()
+                    entry_is_dir = entry.is_dir(follow_symlinks=False)
                 except OSError as e:
                     if not _ignore_error(e):
                         raise
-                if entry_is_dir and not entry.is_symlink():
+                if entry_is_dir:
                     path = parent_path._make_child_relpath(entry.name)
                     for p in self._iterate_directories(path, is_dir, scandir):
                         yield p
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 3b88c0848a04..bd5170651d53 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -1790,6 +1790,15 @@ class _BasePathTest(object):
             subdir.chmod(000)
             self.assertEqual(len(set(base.glob("*"))), 4)
 
+    @os_helper.skip_unless_symlink
+    def test_glob_long_symlink(self):
+        # See gh-87695
+        base = self.cls(BASE) / 'long_symlink'
+        base.mkdir()
+        bad_link = base / 'bad_link'
+        bad_link.symlink_to("bad" * 200)
+        self.assertEqual(sorted(base.glob('**/*')), [bad_link])
+
     def _check_resolve(self, p, expected, strict=True):
         q = p.resolve(strict)
         self.assertEqual(q, expected)
diff --git a/Misc/NEWS.d/next/Library/2023-05-08-15-39-00.gh-issue-87695.f6iO7v.rst b/Misc/NEWS.d/next/Library/2023-05-08-15-39-00.gh-issue-87695.f6iO7v.rst
new file mode 100644
index 000000000000..7b677656bea3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-05-08-15-39-00.gh-issue-87695.f6iO7v.rst
@@ -0,0 +1,2 @@
+Fix issue where :meth:`pathlib.Path.glob` raised :exc:`OSError` when it
+encountered a symlink to an overly long path.