Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 81663 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81663 | lars.gustaebel | 2010-06-03 11:56:22 +0200 (Thu, 03 Jun 2010) | 4 lines

  Issue #8833: tarfile created hard link entries with a size
  field != 0 by mistake. The associated testcase did not
  expose this bug because it was broken too.
........
This commit is contained in:
Lars Gustäbel 2010-06-03 10:07:08 +00:00
parent e036af0ce5
commit 9bcbe49ba1
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/tarfile.py
View File

@ -1880,7 +1880,7 @@ class TarFile(object):
tarinfo.mode = stmd tarinfo.mode = stmd
tarinfo.uid = statres.st_uid tarinfo.uid = statres.st_uid
tarinfo.gid = statres.st_gid tarinfo.gid = statres.st_gid
if stat.S_ISREG(stmd): if type == REGTYPE:
tarinfo.size = statres.st_size tarinfo.size = statres.st_size
else: else:
tarinfo.size = 0L tarinfo.size = 0L

6
Lib/test/test_tarfile.py
View File

@ -617,10 +617,14 @@ class WriteTest(WriteTestBase):
if hasattr(os, "link"): if hasattr(os, "link"):
link = os.path.join(TEMPDIR, "link") link = os.path.join(TEMPDIR, "link")
target = os.path.join(TEMPDIR, "link_target") target = os.path.join(TEMPDIR, "link_target")
open(target, "wb").close() fobj = open(target, "wb")
fobj.write("aaa")
fobj.close()
os.link(target, link) os.link(target, link)
try: try:
tar = tarfile.open(tmpname, self.mode) tar = tarfile.open(tmpname, self.mode)
# Record the link target in the inodes list.
tar.gettarinfo(target)
tarinfo = tar.gettarinfo(link) tarinfo = tar.gettarinfo(link)
self.assertEqual(tarinfo.size, 0) self.assertEqual(tarinfo.size, 0)
finally: finally:

3
Misc/NEWS
View File

@ -58,6 +58,9 @@ C-API
Library Library
------- -------
- Issue #8833: tarfile created hard link entries with a size field != 0 by
mistake.
- Issue #1368247: set_charset (and therefore MIMEText) now automatically - Issue #1368247: set_charset (and therefore MIMEText) now automatically
encodes a unicode _payload to the output_charset. encodes a unicode _payload to the output_charset.