summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2011-03-23 21:09:16 +0000
committerPJ Eby <distutils-sig@python.org>2011-03-23 21:09:16 +0000
commit8d7af6e22f1275ac58b3eccfd43db6e83dfc6e33 (patch)
tree09fe14325e3e6927feb731a18251c61c6c7c44a1 /setuptools
parent9f3c9810de9de1358d4f62ebd74bdf2c866c7d73 (diff)
downloadpython-setuptools-git-8d7af6e22f1275ac58b3eccfd43db6e83dfc6e33.tar.gz
Fixed skipping extraction of files or directories containing '..' in
their names. --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4088795
Diffstat (limited to 'setuptools')
-rwxr-xr-xsetuptools/archive_util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/archive_util.py b/setuptools/archive_util.py
index d26b383b..d44264f8 100755
--- a/setuptools/archive_util.py
+++ b/setuptools/archive_util.py
@@ -138,7 +138,7 @@ def unpack_zipfile(filename, extract_dir, progress_filter=default_filter):
name = info.filename
# don't extract absolute paths or ones with .. in them
- if name.startswith('/') or '..' in name:
+ if name.startswith('/') or '..' in name.split('/'):
continue
target = os.path.join(extract_dir, *name.split('/'))
@@ -180,7 +180,7 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
for member in tarobj:
name = member.name
# don't extract absolute paths or ones with .. in them
- if not name.startswith('/') and '..' not in name:
+ if not name.startswith('/') and '..' not in name.split('/'):
dst = os.path.join(extract_dir, *name.split('/'))
while member is not None and (member.islnk() or member.issym()):
linkpath = member.linkname