From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 22 Jan 2013 15:11:07 +0000 (+0200)
Subject: Issue #1159051: GzipFile now raises EOFError when reading a corrupted file
X-Git-Tag: v3.4.0a1~1555
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc0172c00704e8292c90e02e776b0c193ca75477;p=python

Issue #1159051: GzipFile now raises EOFError when reading a corrupted file
with truncated header or footer.
Added tests for reading truncated gzip, bzip2, and lzma files.
---

cc0172c00704e8292c90e02e776b0c193ca75477
diff --cc Lib/gzip.py
index 698f0c2747,d7da02ca1b..d5b5743ff6
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@@ -284,18 -291,14 +291,14 @@@ class GzipFile(io.BufferedIOBase)
      def _read_gzip_header(self):
          magic = self.fileobj.read(2)
          if magic == b'':
-             raise EOFError("Reached EOF")
+             return False
  
          if magic != b'\037\213':
 -            raise IOError('Not a gzipped file')
 +            raise OSError('Not a gzipped file')
-         method = ord( self.fileobj.read(1) )
+ 
+         method, flag, self.mtime = struct.unpack("<BBIxx", self._read_exact(8))
          if method != 8:
 -            raise IOError('Unknown compression method')
 +            raise OSError('Unknown compression method')
-         flag = ord( self.fileobj.read(1) )
-         self.mtime = read32(self.fileobj)
-         # extraflag = self.fileobj.read(1)
-         # os = self.fileobj.read(1)
-         self.fileobj.read(2)
  
          if flag & FEXTRA:
              # Read & discard the extra field, if present
@@@ -484,13 -478,12 +478,12 @@@
          # We check the that the computed CRC and size of the
          # uncompressed data matches the stored values.  Note that the size
          # stored is the true file size mod 2**32.
-         crc32 = read32(self.fileobj)
-         isize = read32(self.fileobj)  # may exceed 2GB
+         crc32, isize = struct.unpack("<II", self._read_exact(8))
          if crc32 != self.crc:
 -            raise IOError("CRC check failed %s != %s" % (hex(crc32),
 +            raise OSError("CRC check failed %s != %s" % (hex(crc32),
                                                           hex(self.crc)))
          elif isize != (self.size & 0xffffffff):
 -            raise IOError("Incorrect length of data produced")
 +            raise OSError("Incorrect length of data produced")
  
          # Gzip files can be padded with zeroes and still have archives.
          # Consume all zero bytes and set the file position to the first