diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-08-31 13:34:09 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-08-31 13:34:09 (GMT) |
| commit | 2ad5421dad86bc95aabe5c77f6034ee6ca699992 (patch) | |
| tree | bbf0cdb9e99b8913aec6326cc378b96445a11415 /Lib | |
| parent | 3f48d394930097724d5eb01499896d52ced4c4fc (diff) | |
| download | cpython-2ad5421dad86bc95aabe5c77f6034ee6ca699992.zip cpython-2ad5421dad86bc95aabe5c77f6034ee6ca699992.tar.gz cpython-2ad5421dad86bc95aabe5c77f6034ee6ca699992.tar.bz2 | |
don't index outside of the path (closes #22312)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/ntpath.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_ntpath.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/ntpath.py b/Lib/ntpath.py index 228bbb3..fcaf21b 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -113,7 +113,7 @@ def splitdrive(p): """ if len(p) > 1: normp = p.replace(altsep, sep) - if (normp[0:2] == sep*2) and (normp[2] != sep): + if (normp[0:2] == sep*2) and (normp[2:3] != sep): # is a UNC path: # vvvvvvvvvvvvvvvvvvvv drive letter or UNC path # \\machine\mountpoint\directory\etc\... diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py index 78af18c..7b5f7bb 100644 --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -50,6 +50,7 @@ class TestNtpath(unittest.TestCase): # Issue #19911: UNC part containing U+0130 self.assertEqual(ntpath.splitdrive(u'//conky/MOUNTPOİNT/foo/bar'), (u'//conky/MOUNTPOİNT', '/foo/bar')) + self.assertEqual(ntpath.splitdrive("//"), ("", "//")) def test_splitunc(self): tester('ntpath.splitunc("c:\\foo\\bar")', |