diff --git a/Tests/icc/sGrey-v2-nano.icc b/Tests/icc/sGrey-v2-nano.icc new file mode 100644 index 00000000000..0e9edfd4031 Binary files /dev/null and b/Tests/icc/sGrey-v2-nano.icc differ diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py index c80fab75b67..fbd78032e59 100644 --- a/Tests/test_imagecms.py +++ b/Tests/test_imagecms.py @@ -661,6 +661,11 @@ def test_auxiliary_channels_isolated() -> None: assert_image_equal(test_image.convert(dst_format[2]), reference_image) +def test_long_modes() -> None: + p = ImageCms.getOpenProfile("Tests/icc/sGrey-v2-nano.icc") + ImageCms.buildTransform(p, p, "ABCDEFGHI", "ABCDEFGHI") + + @pytest.mark.parametrize("mode", ("RGB", "RGBA", "RGBX")) def test_rgb_lab(mode: str) -> None: im = Image.new(mode, (1, 1)) diff --git a/docs/releasenotes/10.3.0.rst b/docs/releasenotes/10.3.0.rst index 607f0b2620a..2f0437d94f9 100644 --- a/docs/releasenotes/10.3.0.rst +++ b/docs/releasenotes/10.3.0.rst @@ -14,16 +14,11 @@ ImageMath eval() not recommended to process expressions without considering this. :py:meth:`~PIL.ImageMath.lambda_eval` is a more secure alternative. -:cve:`YYYY-XXXXX`: TODO -^^^^^^^^^^^^^^^^^^^^^^^ +:cve:`2024-28219`: Fix buffer overflow in ``_imagingcms.c`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -TODO - -Backwards Incompatible Changes -============================== - -TODO -^^^^ +In ``_imagingcms.c``, two ``strcpy`` calls were able to copy too much data into fixed +length strings. This has been fixed by using ``strncpy`` instead. Deprecations ============ diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 4d66dcc1085..84b8a7e71f9 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -201,8 +201,8 @@ cms_transform_new(cmsHTRANSFORM transform, char *mode_in, char *mode_out) { self->transform = transform; - strcpy(self->mode_in, mode_in); - strcpy(self->mode_out, mode_out); + strncpy(self->mode_in, mode_in, 8); + strncpy(self->mode_out, mode_out, 8); return (PyObject *)self; } @@ -242,10 +242,9 @@ findLCMStype(char *PILmode) { // LabX equivalent like ALab, but not reversed -- no #define in lcms2 return (COLORSPACE_SH(PT_LabV2) | CHANNELS_SH(3) | BYTES_SH(1) | EXTRA_SH(1)); } - else { - /* take a wild guess... but you probably should fail instead. */ - return TYPE_GRAY_8; /* so there's no buffer overrun... */ + /* take a wild guess... */ + return TYPE_GRAY_8; } }