Issue #29079: Prevent infinite loop in pathlib.resolve() on Windows

2016-12-28 16:02:59 -08:00 · 2016-12-28 16:02:59 -08:00 · 4b1e98b0af
parent 40619399bd
commit 4b1e98b0af
2 changed files with 5 additions and 1 deletions
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@ -192,7 +192,9 @@ class _WindowsFlavour(_Flavour):
                        s = self._ext_to_normal(_getfinalpathname(s))
                    except FileNotFoundError:
                        previous_s = s
-                        s = os.path.abspath(os.path.join(s, os.pardir))
+                        s = os.path.dirname(s)
+                        if previous_s == s:
+                            return path
                    else:
                        if previous_s is None:
                            return s
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -40,6 +40,8 @@ Core and Builtins
 Library
 -------

+- Issue #29079: Prevent infinite loop in pathlib.resolve() on Windows
+
 - Issue #13051: Fixed recursion errors in large or resized
  curses.textpad.Textbox.  Based on patch by Tycho Andersen.