From 954c9026bcb142c336ab94fd33b56911ecb06a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= <jridky@redhat.com>
Date: Mon, 18 Jul 2022 08:42:24 +0200
Subject: [PATCH] Resolves: #2091202 - fix CVE-2022-30067

---
 gimp-CVE-2022-30067.patch | 60 +++++++++++++++++++++++++++++++++++++++
 gimp.spec                 |  8 +++++-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 gimp-CVE-2022-30067.patch

diff --git a/gimp-CVE-2022-30067.patch b/gimp-CVE-2022-30067.patch
new file mode 100644
index 0000000..94e29d2
--- /dev/null
+++ b/gimp-CVE-2022-30067.patch
@@ -0,0 +1,60 @@
+From 4f99f1fcfd892ead19831b5adcd38a99d71214b6 Mon Sep 17 00:00:00 2001
+From: Jacob Boerema <jgboerema@gmail.com>
+Date: Fri, 29 Apr 2022 16:40:32 -0400
+Subject: [PATCH] app: fix #8120 GIMP 2.10.30 crashed when allocate large
+ memory
+
+GIMP could crash if the information regarding old path properties read
+from XCF was incorrect. It did not check if xcf_old_path succeeded and
+kept trying to load more paths even if the last one failed to load.
+
+Instead we now stop loading paths as soon as that function fails.
+In case we have a failure here we also try to skip to the next property
+based on the size of the path property, in hopes that the only problem
+was this property.
+---
+ app/xcf/xcf-load.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
+index ac9c4ea248..67bc766390 100644
+--- a/app/xcf/xcf-load.c
++++ b/app/xcf/xcf-load.c
+@@ -1168,7 +1168,12 @@ xcf_load_image_props (XcfInfo   *info,
+           break;
+ 
+         case PROP_PATHS:
+-          xcf_load_old_paths (info, image);
++          {
++            goffset base = info->cp;
++
++            if (! xcf_load_old_paths (info, image))
++              xcf_seek_pos (info, base + prop_size, NULL);
++          }
+           break;
+ 
+         case PROP_USER_UNIT:
+@@ -3035,8 +3040,11 @@ xcf_load_old_paths (XcfInfo   *info,
+   xcf_read_int32 (info, &last_selected_row, 1);
+   xcf_read_int32 (info, &num_paths,         1);
+ 
++  GIMP_LOG (XCF, "Number of old paths: %u", num_paths);
++
+   while (num_paths-- > 0)
+-    xcf_load_old_path (info, image);
++    if (! xcf_load_old_path (info, image))
++      return FALSE;
+ 
+   active_vectors =
+     GIMP_VECTORS (gimp_container_get_child_by_index (gimp_image_get_vectors (image),
+@@ -3087,7 +3095,7 @@ xcf_load_old_path (XcfInfo   *info,
+     }
+   else if (version != 1)
+     {
+-      g_printerr ("Unknown path type. Possibly corrupt XCF file");
++      g_printerr ("Unknown path type (version: %u). Possibly corrupt XCF file.\n", version);
+ 
+       g_free (name);
+       return FALSE;
+-- 
+GitLab
diff --git a/gimp.spec b/gimp.spec
index d5df6c2..c98ab16 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -88,7 +88,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.99.8
-%global rel 2
+%global rel 3
 Release:        %{?prerelprefix}%{rel}%{dotprerel}%{dotgitrev}%{?dist}
 
 # Compute some version related macros.
@@ -243,6 +243,9 @@ Patch3:         gimp-2.10.18-no-phone-home-default.patch
 # no luajit available in RHEL-9
 Patch4:         gimp-remove-lua.patch
 
+# CVE-2022-30067
+Patch5:         gimp-CVE-2022-30067.patch
+
 # use external help browser directly if help browser plug-in is not built
 Patch100:       gimp-2.10.24-external-help-browser.patch
 
@@ -728,6 +731,9 @@ make check %{?_smp_mflags}
 %endif
 
 %changelog
+* Mon Jul 18 2022 Josef Ridky <jridky@redhat.com> - 2:2.99.8-3
+- fix CVE-2022-30067
+
 * Wed Mar 09 2022 Josef Ridky <jridky@redhat.com> - 2:2.99.8-2
 - Remove luajit requirement