Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Lib/test/test_zlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,18 @@ def test_decompress_unused_data(self):
self.assertEqual(dco.unconsumed_tail, b'')
self.assertEqual(dco.unused_data, remainder)

def test_decompress_unconsumed_tail_after_eof(self):
source = b'abcdefghijklmnopqrstuvwxyz'
remainder = b'0123456789'
dco = zlib.decompressobj()
data = dco.decompress(zlib.compress(source) + remainder, 1)
data += dco.decompress(dco.unconsumed_tail)

self.assertTrue(dco.eof)
self.assertEqual(data, source)
self.assertEqual(dco.unconsumed_tail, b'')
self.assertEqual(dco.unused_data, remainder)

# issue27164
def test_decompress_raw_with_dictionary(self):
zdict = b'abcdefghijklmnopqrstuvwxyz'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :attr:`zlib.Decompress.unconsumed_tail` duplicating
:attr:`~zlib.Decompress.unused_data` after end of stream when *max_length* was used.
1 change: 1 addition & 0 deletions Modules/zlibmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,6 +838,7 @@ save_unconsumed_input(compobject *self, Py_buffer *data, int err)
return -1;
}
Py_SETREF(self->unused_data, new_unused_data);
self->zst.next_in += left_size;
self->zst.avail_in = 0;
}
}
Expand Down
Loading