gh-158169: Clear unconsumed_tail at EOF

Author: GruffElixir

Lib/test/test_zlib.py

@@ -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 = bytes(range(256)) * 4
+        remainder = b'extra'
+        dco = zlib.decompressobj()
+        chunks = [dco.decompress(zlib.compress(source) + remainder, 100)]
+        while not dco.eof:
+            chunks.append(dco.decompress(dco.unconsumed_tail, 100))
+
+        self.assertEqual(b''.join(chunks), source)
+        self.assertEqual(dco.unconsumed_tail, b'')
+        self.assertEqual(dco.unused_data, remainder)
+
     # issue27164
     def test_decompress_raw_with_dictionary(self):
         zdict = b'abcdefghijklmnopqrstuvwxyz'

Misc/NEWS.d/next/Library/2026-09-25-22-15-54.gh-issue-158169.ZlibTail.rst

@@ -0,0 +1,2 @@
+Clear ``Decompress.unconsumed_tail`` once decompression reaches EOF. Trailing
+input is available only through ``Decompress.unused_data``.

Modules/zlibmodule.c

@@ -838,6 +838,8 @@ save_unconsumed_input(compobject *self, Py_buffer *data, int err)
                 return -1;
             }
             Py_SETREF(self->unused_data, new_unused_data);
+            /* These bytes are now in unused_data, not unconsumed_tail. */
+            self->zst.next_in += left_size;
             self->zst.avail_in = 0;
         }
     }