From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 30 Oct 2016 18:52:55 +0000 (+0200)
Subject: Issue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
X-Git-Tag: v2.7.13rc1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5396257be241a21a04f1db61e5dd99a6ddc8d823;p=python

Issue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
file with compression before trying to open it without compression.  Otherwise
it had 50% chance failed with ignore_zeros=True.
---

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index be688005f4..adf91d5382 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1665,7 +1665,9 @@ class TarFile(object):
 
         if mode in ("r", "r:*"):
             # Find out which *open() is appropriate for opening the file.
-            for comptype in cls.OPEN_METH:
+            def not_compressed(comptype):
+                return cls.OPEN_METH[comptype] == 'taropen'
+            for comptype in sorted(cls.OPEN_METH, key=not_compressed):
                 func = getattr(cls, cls.OPEN_METH[comptype])
                 if fileobj is not None:
                     saved_pos = fileobj.tell()
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 3f9e9960b7..89bd738aea 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -2,7 +2,9 @@ import sys
 import os
 import shutil
 import StringIO
+from binascii import unhexlify
 from hashlib import md5
+from random import Random
 import errno
 
 import unittest
@@ -276,12 +278,17 @@ class CommonReadTest(ReadTest):
         else:
             _open = open
 
+        # generate 512 pseudorandom bytes
+        data = unhexlify('%1024x' % Random(0).getrandbits(512*8))
         for char in ('\0', 'a'):
             # Test if EOFHeaderError ('\0') and InvalidHeaderError ('a')
             # are ignored correctly.
             with _open(tmpname, "wb") as fobj:
                 fobj.write(char * 1024)
-                fobj.write(tarfile.TarInfo("foo").tobuf())
+                tarinfo = tarfile.TarInfo("foo")
+                tarinfo.size = len(data)
+                fobj.write(tarinfo.tobuf())
+                fobj.write(data)
 
             tar = tarfile.open(tmpname, mode="r", ignore_zeros=True)
             try:
diff --git a/Misc/NEWS b/Misc/NEWS
index 12c3da2b7c..760a6ea132 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
+  file with compression before trying to open it without compression.  Otherwise
+  it had 50% chance failed with ignore_zeros=True.
+
 - Issue #25464: Fixed HList.header_exists() in Tix module by adding
   a workaround to Tix library bug.