diff --git a/SOURCES/0001-jpeg-Reject-unsupported-number-of-components.patch b/SOURCES/0001-jpeg-Reject-unsupported-number-of-components.patch new file mode 100644 index 0000000..2e97f8a --- /dev/null +++ b/SOURCES/0001-jpeg-Reject-unsupported-number-of-components.patch @@ -0,0 +1,37 @@ +From 6cce9311e70b969cbcc6e3e1e74ae1756ed02d5b Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Mon, 30 Mar 2026 12:21:56 -0400 +Subject: [PATCH] jpeg: Reject unsupported number of components + +This condition was already checked for incremental loading. +This commit adds the same check in the nonincremental +code path. + +Closes: #304 +--- + gdk-pixbuf/io-jpeg.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c +index ac6adbdf11..bb659b79e0 100644 +--- a/gdk-pixbuf/io-jpeg.c ++++ b/gdk-pixbuf/io-jpeg.c +@@ -622,6 +622,18 @@ gdk_pixbuf__jpeg_image_load (FILE *f, GError **error) + cinfo.do_fancy_upsampling = FALSE; + cinfo.do_block_smoothing = FALSE; + ++ /* Reject unsupported component counts */ ++ if (cinfo.output_components != 3 && cinfo.output_components != 4 && ++ !(cinfo.output_components == 1 && ++ cinfo.out_color_space == JCS_GRAYSCALE)) { ++ g_set_error (error, ++ GDK_PIXBUF_ERROR, ++ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, ++ _("Unsupported number of color components (%d)"), ++ cinfo.output_components); ++ goto out; ++ } ++ + pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + cinfo.out_color_components == 4 ? TRUE : FALSE, + 8, cinfo.output_width, cinfo.output_height); diff --git a/SPECS/gdk-pixbuf2.spec b/SPECS/gdk-pixbuf2.spec index 4072081..de820a7 100644 --- a/SPECS/gdk-pixbuf2.spec +++ b/SPECS/gdk-pixbuf2.spec @@ -2,7 +2,7 @@ Name: gdk-pixbuf2 Version: 2.42.6 -Release: 6%{?dist} +Release: 6%{?dist}.1 Summary: An image loading library License: LGPLv2+ @@ -13,6 +13,7 @@ Patch0: gif-check-for-overflow.patch Patch1: gif-lzw-code-size-overflow.patch Patch2: CVE-2022-48622.patch Patch3: 0001-jpeg-Be-more-careful-with-chunked-icc-data.patch +Patch4: 0001-jpeg-Reject-unsupported-number-of-components.patch BuildRequires: docbook-style-xsl BuildRequires: gettext @@ -123,6 +124,10 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache %{_datadir}/installed-tests %changelog +* Tue Apr 21 2026 Benjamin Otte - 2.42.6-6 - Fix an oversight - Related: RHEL-102354