Accepting request 1031331 from GNOME:Next

New upstream release

OBS-URL: https://build.opensuse.org/request/show/1031331
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=196
This commit is contained in:
Dominique Leuenberger 2022-10-27 06:10:03 +00:00 committed by Git OBS Bridge
parent dd79ee2137
commit 3af4edc280
6 changed files with 17 additions and 41 deletions

View File

@ -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.2

View File

@ -1,9 +1,9 @@
<services>
<service name="download_url" mode="disabled">
<service name="download_url" mode="manual">
<param name="protocol">https</param>
<param name="host">download.gnome.org</param>
<param name="path">sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.9.tar.xz</param>
<param name="path">sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.tar.xz</param>
</service>
<service name="set_version" mode="disabled" />
<service name="set_version" mode="manual" />
</services>

BIN
gdk-pixbuf-2.42.10.zip (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:77ce44e314d8e2f4731b91b3d2dd6f6d3687b9b8b3aac52abd2201f92b3f113d
size 8423841

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Oct 26 11:58:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.42.10:
+ Search for rst2man.py.
+ Update the memory size limit for JPEG images.
+ Updated translations.
- Drop patch fixed upstream (with different limit):
+ 0001-jpeg-Increase-memory-limit-for-loading-image-data.patch
-------------------------------------------------------------------
Tue Aug 30 16:49:32 UTC 2022 - Michael Gorse <mgorse@suse.com>

View File

@ -20,7 +20,7 @@
%define gdk_pixbuf_binary_version 2.10.0
Name: gdk-pixbuf
Version: 2.42.9
Version: 2.42.10
Release: 0
Summary: An image loading library
License: LGPL-2.1-or-later
@ -36,8 +36,6 @@ Source1: macros.gdk-pixbuf
Source2: README.SUSE
Source3: gdk-pixbuf-rpmlintrc
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM 0001-jpeg-Increase-memory-limit-for-loading-image-data.patch mgorse@suse.com -- fix loading of larger images.
Patch0: 0001-jpeg-Increase-memory-limit-for-loading-image-data.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docutils