From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sun, 28 Aug 2011 09:29:35 +0000 (+0200)
Subject: Merge: #12839: Fix crash in zlib module due to version mismatch.
X-Git-Tag: v3.3.0a1~1606
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44c6ef50af9980f33f6373440f0afc9cfa800c86;p=thirdparty%2FPython%2Fcpython.git

Merge: #12839: Fix crash in zlib module due to version mismatch.

If the version of zlib used to compile the zlib module is incompatible
with the one that is actually linked in, then calls into zlib will fail.
This can leave attributes of the z_stream uninitialized, so we must take
care to avoid segfaulting by trying to use an invalid pointer.

Fix by Richard M. Tew.
---

44c6ef50af9980f33f6373440f0afc9cfa800c86
diff --cc Misc/NEWS
index 85dbe25876b2,23b336bb52bb..b852219d6513
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -268,45 -85,6 +268,48 @@@ Core and Builtin
  Library
  -------
  
++- Issue #12839: Fix crash in zlib module due to version mismatch.
++  Fix by Richard M. Tew.
++
 +- Issue #9923: The mailcap module now correctly uses the platform path
 +  separator for the MAILCAP environment variable on non-POSIX platforms.
 +
 +- Issue #12835: Follow up to #6560 that unconditionally prevents use of the
 +  unencrypted sendmsg/recvmsg APIs on SSL wrapped sockets. Patch by David
 +  Watson.
 +
 +- Issue #12803: SSLContext.load_cert_chain() now accepts a password argument
 +  to be used if the private key is encrypted.  Patch by Adam Simpkins.
 +
 +- Issue #11657: Fix sending file descriptors over 255 over a multiprocessing
 +  Pipe.
 +
 +- Issue #12811: tabnanny.check() now promptly closes checked files. Patch by
 +  Anthony Briggs.
 +
 +- Issue #6560: The sendmsg/recvmsg API is now exposed by the socket module
 +  when provided by the underlying platform, supporting processing of
 +  ancillary data in pure Python code. Patch by David Watson and Heiko Wundram.
 +
 +- Issue #12326: On Linux, sys.platform doesn't contain the major version
 +  anymore. It is now always 'linux', instead of 'linux2' or 'linux3' depending
 +  on the Linux version used to build Python.
 +
 +- Issue #12213: Fix a buffering bug with interleaved reads and writes that
 +  could appear on BufferedRandom streams.
 +
 +- Issue #12778: Reduce memory consumption when JSON-encoding a large
 +  container of many small objects.
 +
 +- Issue #12650: Fix a race condition where a subprocess.Popen could leak
 +  resources (FD/zombie) when killed at the wrong time.
 +
 +- Issue #12744: Fix inefficient representation of integers between 2**31 and
 +  2**63 on systems with a 64-bit C "long".
 +
 +- Issue #12646: Add an 'eof' attribute to zlib.Decompress, to make it easier to
 +  detect truncated input streams.
 +
  - Issue #11513: Fix exception handling ``tarfile.TarFile.gzopen()`` when
    the file cannot be opened.