mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-26 19:55:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

#4489: Don't follow ever symlinks in rmtree

Browse source 
Also added several regression tests.
This commit is contained in:
Hynek Schlawack 2012-06-28 12:07:29 +02:00
parent 591c1cca32
commit a75cd1ce73
2 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/shutil.py
View file

@ -380,7 +380,7 @@ def _rmtree_safe_fd(topfd, path, onerror):
for name in names:
fullname = os.path.join(path, name)
try:
orig_st = os.stat(name, dir_fd=topfd)
orig_st = os.stat(name, dir_fd=topfd, follow_symlinks=False)
mode = orig_st.st_mode
except os.error:
mode = 0
@ -445,7 +445,7 @@ def rmtree(path, ignore_errors=False, onerror=None):
if (stat.S_ISDIR(orig_st.st_mode) and
os.path.samestat(orig_st, os.fstat(fd))):
_rmtree_safe_fd(fd, path, onerror)
elif (stat.S_ISREG(orig_st.st_mode)):
else:
raise NotADirectoryError(20,
"Not a directory: '{}'".format(path))
finally: