From 40d1321d497e20a367da761bffe2af2c858d1462 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 27 Oct 2022 22:23:05 +0100 Subject: [PATCH] Update to 2.42.10 --- .gitignore | 1 + ...-memory-limit-for-loading-image-data.patch | 32 ------------------- gdk-pixbuf2.spec | 10 +++--- sources | 2 +- 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 0001-jpeg-Increase-memory-limit-for-loading-image-data.patch diff --git a/.gitignore b/.gitignore index ca5b262..804345f 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ gdk-pixbuf-2.21.6.tar.bz2 /gdk-pixbuf-2.42.6.tar.xz /gdk-pixbuf-2.42.8.tar.xz /gdk-pixbuf-2.42.9.tar.xz +/gdk-pixbuf-2.42.10.tar.xz diff --git a/0001-jpeg-Increase-memory-limit-for-loading-image-data.patch b/0001-jpeg-Increase-memory-limit-for-loading-image-data.patch deleted file mode 100644 index 6a9729e..0000000 --- a/0001-jpeg-Increase-memory-limit-for-loading-image-data.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 17a924a2275b3e7721dc05e0670cae638371a98f Mon Sep 17 00:00:00 2001 -From: Jake Dane <3689-jakedane@users.noreply.gitlab.gnome.org> -Date: Fri, 19 Aug 2022 06:12:25 +0000 -Subject: [PATCH] jpeg: Increase memory limit for loading image data - -As fix for security issue #205 when loading image data the memory size -was limited to 100 MB. That seemed like a good threshold. For larger -images, from around 18 megapixels (MP) and up though not for all such -images, this threshold was too low. Increasing the threshold too 300 MB -seems to work better and lets larger images load. - -Fixes #216. ---- - gdk-pixbuf/io-jpeg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c -index 22f4174fe..6317e20d3 100644 ---- a/gdk-pixbuf/io-jpeg.c -+++ b/gdk-pixbuf/io-jpeg.c -@@ -1091,7 +1091,7 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data, - rc = jpeg_read_header (cinfo, TRUE); - context->src_initialized = TRUE; - -- cinfo->mem->max_memory_to_use = 100 * 1024 * 1024; -+ cinfo->mem->max_memory_to_use = 300 * 1024 * 1024; - - if (rc == JPEG_SUSPENDED) - continue; --- -2.37.3 - diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec index 373ff1a..6b9bc5e 100644 --- a/gdk-pixbuf2.spec +++ b/gdk-pixbuf2.spec @@ -1,8 +1,8 @@ %global glib2_version 2.56.0 Name: gdk-pixbuf2 -Version: 2.42.9 -Release: 2%{?dist} +Version: 2.42.10 +Release: 1%{?dist} Summary: An image loading library License: LGPLv2+ @@ -28,9 +28,6 @@ Requires: glib2%{?_isa} >= %{glib2_version} # We also need MIME information at runtime Requires: shared-mime-info -# https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/216 -Patch0: 0001-jpeg-Increase-memory-limit-for-loading-image-data.patch - %description gdk-pixbuf is an image loading library that can be extended by loadable modules for new image formats. It is used by toolkits such as GTK+ or @@ -128,6 +125,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache %{_datadir}/installed-tests %changelog +* Thu Oct 27 2022 David King - 2.42.10-1 +- Update to 2.42.10 + * Wed Sep 28 2022 Bastien Nocera - 2.42.9-2 - Fix loading of large JPEG files diff --git a/sources b/sources index ac8e421..fa9d8b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gdk-pixbuf-2.42.9.tar.xz) = 032869c98d22cc4add05198baec5a64d29af247a99a084d7c498f82f467fb2a2008a8d0d4564ee5d963f6965dc9b3ff61b6c07377f67fec70ddf14e5373abfb3 +SHA512 (gdk-pixbuf-2.42.10.tar.xz) = ad64963b61ef8cc84ae450328ec8c90a852f974e29ffdd42263ed32de47af93c058f3ffdf91c5d6e9bba815f4e8e8fe5a19422ac1bfb079666339814ac059b3a