Fix by Lars Gustaebel for bug 721871: don't get upset if the prefix

field contains garbage after the first NUL character.
This commit is contained in:
Jack Jansen 2003-04-22 22:03:11 +00:00
parent 70995830a6
commit 2b4b5a54d6
1 changed files with 4 additions and 9 deletions

View File

@ -671,18 +671,13 @@ class TarInfo(object):
tarinfo.devminor = int(buf[337:345], 8)
except ValueError:
tarinfo.devmajor = tarinfo.devmajor = 0
tarinfo.prefix = buf[345:500]
# The prefix field is used for filenames > 100 in
# the POSIX standard.
# name = prefix + "/" + name
prefix = buf[345:500]
while prefix and prefix[-1] == NUL:
prefix = prefix[:-1]
if len(prefix.split(NUL)) == 1:
tarinfo.prefix = prefix
tarinfo.name = normpath(os.path.join(tarinfo.prefix, tarinfo.name))
else:
tarinfo.prefix = buf[345:500]
# name = prefix + '/' + name
if tarinfo.type != GNUTYPE_SPARSE:
tarinfo.name = normpath(os.path.join(nts(tarinfo.prefix), tarinfo.name))
# Directory names should have a '/' at the end.
if tarinfo.isdir() and tarinfo.name[-1:] != "/":