Skip to content

Commit c26e40b

Browse files
[3.14] gh-158169: Clear zlib.Decompress.unconsumed_tail at end of stream (GH-158177)
(cherry picked from commit 8122ff4) Co-authored-by: GruffElixir <samarthat9@gmail.com> Co-authored-by: Stan Ulbrych <stan@python.org>
1 parent 5e6436a commit c26e40b

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
@@ -651,6 +651,18 @@ def test_decompress_unused_data(self):
651651
self.assertEqual(dco.unconsumed_tail, b'')
652652
self.assertEqual(dco.unused_data, remainder)
653653

654+
def test_decompress_unconsumed_tail_after_eof(self):
655+
source = b'abcdefghijklmnopqrstuvwxyz'
656+
remainder = b'0123456789'
657+
dco = zlib.decompressobj()
658+
data = dco.decompress(zlib.compress(source) + remainder, 1)
659+
data += dco.decompress(dco.unconsumed_tail)
660+
661+
self.assertTrue(dco.eof)
662+
self.assertEqual(data, source)
663+
self.assertEqual(dco.unconsumed_tail, b'')
664+
self.assertEqual(dco.unused_data, remainder)
665+
654666
# issue27164
655667
def test_decompress_raw_with_dictionary(self):
656668
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
@@ -842,6 +842,7 @@ save_unconsumed_input(compobject *self, Py_buffer *data, int err)
842842
memcpy(PyBytes_AS_STRING(new_data) + old_size,
843843
self->zst.next_in, left_size);
844844
Py_SETREF(self->unused_data, new_data);
845+
self->zst.next_in += left_size;
845846
self->zst.avail_in = 0;
846847
}
847848
}

0 commit comments

Comments
 (0)