From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sun, 11 Nov 2012 01:24:37 +0000 (+0100)
Subject: Issue #16350, part 2: Set unused_data (and unconsumed_tail) correctly in decompressob... 
X-Git-Tag: v3.4.0a1~2040
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ea64e38b5e1b947fef9e53e3f63994b79e264e7;p=thirdparty%2FPython%2Fcpython.git

Issue #16350, part 2: Set unused_data (and unconsumed_tail) correctly in decompressobj().flush().

Additionally, fix a bug where a MemoryError in allocating a bytes object could
leave the decompressor object in an invalid state (with its unconsumed_tail
member being NULL).

Patch by Serhiy Storchaka.
---

9ea64e38b5e1b947fef9e53e3f63994b79e264e7
diff --cc Misc/NEWS
index 6b08b0938a7e,de6ec4f26286..2c80158b1432
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -124,12 -91,11 +124,14 @@@ Librar
  - Issue #16431: Use the type information when constructing a Decimal subtype
    from a Decimal argument.
  
 +- Issue #15641: Clean up deprecated classes from importlib
 +  Patch by Taras Lyapun.
 +
- - Issue #16350: zlib.Decompress.decompress() now accumulates data from
+ - Issue #16350: zlib.decompressobj().decompress() now accumulates data from
    successive calls after EOF in unused_data, instead of only saving the argument
-   to the last call. Patch by Serhiy Storchaka.
+   to the last call. decompressobj().flush() now correctly sets unused_data and
+   unconsumed_tail. A bug in the handling of MemoryError when setting the
+   unconsumed_tail attribute has also been fixed. Patch by Serhiy Storchaka.
  
  - Issue #12759: sre_parse now raises a proper error when the name of the group
    is missing.  Initial patch by Serhiy Storchaka.