diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-12-16 12:49:37 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-12-16 12:49:37 (GMT) |
| commit | 3d068b2ecfd0e04d61289dce5abed60cd88b4f9f (patch) | |
| tree | 52135468db5a2c56a1ce63d49785a5e4d47fbb77 | |
| parent | dec59ec5ff9f48d1fe9bf8f5ff3874ef9f0f54ad (diff) | |
| download | cpython-3d068b2ecfd0e04d61289dce5abed60cd88b4f9f.zip cpython-3d068b2ecfd0e04d61289dce5abed60cd88b4f9f.tar.gz cpython-3d068b2ecfd0e04d61289dce5abed60cd88b4f9f.tar.bz2 | |
Issue #16626: Fix infinite recursion in glob.glob() on Windows when the pattern contains a wildcard in the drive or UNC path.
Patch by Serhiy Storchaka.
| -rw-r--r-- | Lib/glob.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_glob.py | 13 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 21 insertions, 1 deletions
diff --git a/Lib/glob.py b/Lib/glob.py index 36d493d..7279244 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -29,7 +29,10 @@ def iglob(pathname): for name in glob1(None, basename): yield name return - if has_magic(dirname): + # `os.path.split()` returns the argument itself as a dirname if it is a + # drive or UNC path. Prevent an infinite recursion if a drive or UNC path + # contains magic characters (i.e. r'\\?\C:'). + if dirname != pathname and has_magic(dirname): dirs = iglob(dirname) else: dirs = [dirname] diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py index 711369e..0083a70 100644 --- a/Lib/test/test_glob.py +++ b/Lib/test/test_glob.py @@ -3,6 +3,7 @@ from test.support import run_unittest, TESTFN, skip_unless_symlink, can_symlink import glob import os import shutil +import sys class GlobTests(unittest.TestCase): @@ -110,6 +111,18 @@ class GlobTests(unittest.TestCase): eq(self.glob('sym1'), [self.norm('sym1')]) eq(self.glob('sym2'), [self.norm('sym2')]) + @unittest.skipUnless(sys.platform == "win32", "Win32 specific test") + def test_glob_magic_in_drive(self): + eq = self.assertSequencesEqual_noorder + eq(glob.glob('*:'), []) + eq(glob.glob(b'*:'), []) + eq(glob.glob('?:'), []) + eq(glob.glob(b'?:'), []) + eq(glob.glob('\\\\?\\c:\\'), ['\\\\?\\c:\\']) + eq(glob.glob(b'\\\\?\\c:\\'), [b'\\\\?\\c:\\']) + eq(glob.glob('\\\\*\\*\\'), []) + eq(glob.glob(b'\\\\*\\*\\'), []) + def test_main(): run_unittest(GlobTests) @@ -179,6 +179,10 @@ Core and Builtins Library ------- +- Issue #16626: Fix infinite recursion in glob.glob() on Windows when the + pattern contains a wildcard in the drive or UNC path. Patch by Serhiy + Storchaka. + - Issue #16298: In HTTPResponse.read(), close the socket when there is no Content-Length and the incoming stream is finished. Patch by Eran Rundstein. |