File size: 3,129 Bytes
8247f19 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | diff --git a/Tests/images/ossfuzz-4836216264589312.pcx b/Tests/images/ossfuzz-4836216264589312.pcx
new file mode 100644
index 0000000000000000000000000000000000000000..fdde9716a0cbd84900f9499c2f8c6d13067d456a
GIT binary patch
literal 129
wcmd;LP+(+WP*4Ej|6rg11t1QLjY`90z%&y`Cj@}_2tCMbm<ohC5DTmV00Yb}N&o-=
literal 0
HcmV?d00001
diff --git a/Tests/test_image.py b/Tests/test_image.py
index 84c098cc8..d91f1c263 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -775,26 +775,29 @@ class TestImage:
with pytest.warns(DeprecationWarning):
assert test_module.PILLOW_VERSION > "7.0.0"
- def test_overrun(self):
- """For overrun completeness, test as:
- valgrind pytest -qq Tests/test_image.py::TestImage::test_overrun | grep decode.c
- """
- for file in [
+ @pytest.mark.parametrize("path", [
"fli_overrun.bin",
"sgi_overrun.bin",
"sgi_overrun_expandrow.bin",
"sgi_overrun_expandrow2.bin",
"pcx_overrun.bin",
"pcx_overrun2.bin",
+ "ossfuzz-4836216264589312.pcx",
"01r_00.pcx",
- ]:
- with Image.open(os.path.join("Tests/images", file)) as im:
- try:
- im.load()
- assert False
- except OSError as e:
- assert str(e) == "buffer overrun when reading image file"
+ ])
+ def test_overrun(self, path):
+ """For overrun completeness, test as:
+ valgrind pytest -qq Tests/test_image.py::TestImage::test_overrun | grep decode.c
+ """
+ with Image.open(os.path.join("Tests/images", path)) as im:
+ try:
+ im.load()
+ assert False
+ except OSError as e:
+ assert (str(e) == "buffer overrun when reading image file" or
+ "image file is truncated" in str(e))
+ def test_fli_overrun2(self):
with Image.open("Tests/images/fli_overrun2.bin") as im:
try:
im.seek(1)
diff --git a/src/PIL/PcxImagePlugin.py b/src/PIL/PcxImagePlugin.py
index b337b7dde..a24d44b42 100644
--- a/src/PIL/PcxImagePlugin.py
+++ b/src/PIL/PcxImagePlugin.py
@@ -66,13 +66,13 @@ class PcxImageFile(ImageFile.ImageFile):
version = s[1]
bits = s[3]
planes = s[65]
- stride = i16(s, 66)
+ ignored_stride = i16(s, 66)
logger.debug(
"PCX version %s, bits %s, planes %s, stride %s",
version,
bits,
planes,
- stride,
+ ignored_stride,
)
self.info["dpi"] = i16(s, 12), i16(s, 14)
@@ -110,6 +110,11 @@ class PcxImageFile(ImageFile.ImageFile):
self.mode = mode
self._size = bbox[2] - bbox[0], bbox[3] - bbox[1]
+ # don't trust the passed in stride. Calculate for ourselves.
+ # CVE-2020-35655
+ stride = (self._size[0] * bits + 7) // 8
+ stride += stride % 2
+
bbox = (0, 0) + self.size
logger.debug("size: %sx%s", *self.size)
|