gh-101322: Ensure test_zlib.ZlibDecompressorTest runs, fix errors in ZlibDecompressor (#101323)

rhpvorderman · web-flow · commit a89e6713c4de · 2023-02-04T12:07:30.000-08:00
* Ensure test_zlib.ZlibDecompressorTest actually runs, fix errors in ZlibDecompressor.
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py
@@ -944,13 +944,18 @@ def choose_lines(source, number, seed=None, generator=random):
 """
 
 
-class ZlibDecompressorTest():
+class ZlibDecompressorTest(unittest.TestCase):
     # Test adopted from test_bz2.py
     TEXT = HAMLET_SCENE
     DATA = zlib.compress(HAMLET_SCENE)
     BAD_DATA = b"Not a valid deflate block"
+    BIG_TEXT = DATA * ((128 * 1024 // len(DATA)) + 1)
+    BIG_DATA = zlib.compress(BIG_TEXT)
+
     def test_Constructor(self):
-        self.assertRaises(TypeError, zlib._ZlibDecompressor, 42)
+        self.assertRaises(TypeError, zlib._ZlibDecompressor, "ASDA")
+        self.assertRaises(TypeError, zlib._ZlibDecompressor, -15, "notbytes")
+        self.assertRaises(TypeError, zlib._ZlibDecompressor, -15, b"bytes", 5)
 
     def testDecompress(self):
         zlibd = zlib._ZlibDecompressor()
diff --git a/Misc/NEWS.d/next/Library/2023-01-26-06-44-35.gh-issue-101323.h8Hk11.rst b/Misc/NEWS.d/next/Library/2023-01-26-06-44-35.gh-issue-101323.h8Hk11.rst
@@ -0,0 +1,2 @@
+Fix a bug where errors where not thrown by zlib._ZlibDecompressor if
+encountered during decompressing.
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
@@ -1519,6 +1519,7 @@ decompress_buf(ZlibDecompressor *self, Py_ssize_t max_length)
         }
     } else if (err != Z_OK && err != Z_BUF_ERROR) {
         zlib_error(state, self->zst, err, "while decompressing data");
+        goto error;
     }
 
     self->avail_in_real += self->zst.avail_in;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix a bug where errors where not thrown by zlib._ZlibDecompressor if`
	`2`	`+encountered during decompressing.`
Original fi 6DF3 le line number	Diff line number	Diff line change
`@@ -1519,6 +1519,7 @@ decompress_buf(ZlibDecompressor *self, Py_ssize_t max_length)`
`1519`	`1519`	`}`
`1520`	`1520`	`} else if (err != Z_OK && err != Z_BUF_ERROR) {`
`1521`	`1521`	`zlib_error(state, self->zst, err, "while decompressing data");`
	`1522`	`+ goto error;`
`1522`	`1523`	`}`
`1523`	`1524`
`1524`	`1525`	`self->avail_in_real += self->zst.avail_in;`