Skip to content

Commit 8122ff4

Browse files
gh-158169: Clear zlib.Decompress.unconsumed_tail at end of stream (#158177)
Co-authored-by: Stan Ulbrych <stan@python.org>
1 parent 499dff1 commit 8122ff4

3 files changed

Lines changed: 15 additions & 0 deletions

File tree

‎Lib/test/test_zlib.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,18 @@ def test_decompress_unused_data(self):
822822
self.assertEqual(dco.unconsumed_tail, b'')
823823
self.assertEqual(dco.unused_data, remainder)
824824

825+
def test_decompress_unconsumed_tail_after_eof(self):
826+
source = b'abcdefghijklmnopqrstuvwxyz'
827+
remainder = b'0123456789'
828+
dco = zlib.decompressobj()
829+
data = dco.decompress(zlib.compress(source) + remainder, 1)
830+
data += dco.decompress(dco.unconsumed_tail)
831+
832+
self.assertTrue(dco.eof)
833+
self.assertEqual(data, source)
834+
self.assertEqual(dco.unconsumed_tail, b'')
835+
self.assertEqual(dco.unused_data, remainder)
836+
825837
# issue27164
826838
def test_decompress_raw_with_dictionary(self):
827839
zdict = b'abcdefghijklmnopqrstuvwxyz'
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix :attr:`zlib.Decompress.unconsumed_tail` duplicating
2+
:attr:`~zlib.Decompress.unused_data` after end of stream when *max_length* was used.

‎Modules/zlibmodule.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,7 @@ save_unconsumed_input(compobject *self, Py_buffer *data, int err)
838838
return -1;
839839
}
840840
Py_SETREF(self->unused_data, new_unused_data);
841+
self->zst.next_in += left_size;
841842
self->zst.avail_in = 0;
842843
}
843844
}

0 commit comments

Comments
 (0)