From 02ae471cadae7d72681428c45d05513a706b2173 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 10 Dec 2023 23:11:34 +0100 Subject: [PATCH] Backport an upstream patch to fix a write after free issue (rhbz#2253814) --- ...-Revert-settings-Always-free-variant.patch | 26 +++++++++++++++++++ libhandy.spec | 10 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-settings-Always-free-variant.patch diff --git a/0001-Revert-settings-Always-free-variant.patch b/0001-Revert-settings-Always-free-variant.patch new file mode 100644 index 0000000..1a98d49 --- /dev/null +++ b/0001-Revert-settings-Always-free-variant.patch @@ -0,0 +1,26 @@ +From 7e8a8529c4d79119d0f0acd81b1f1dbbd558978f Mon Sep 17 00:00:00 2001 +From: Alice Mikhaylenko +Date: Thu, 11 May 2023 21:32:15 +0000 +Subject: [PATCH] Revert "settings: Always free variant" + +This reverts commit 314b81a0e3b6bbef7bb22a622ceb86cb068acf51 +--- + src/hdy-settings.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/hdy-settings.c b/src/hdy-settings.c +index b7ab2f33ce..4f655158f8 100644 +--- a/src/hdy-settings.c ++++ b/src/hdy-settings.c +@@ -262,8 +262,6 @@ settings_portal_changed_cb (GDBusProxy *proxy, + + return; + } +- +- g_variant_unref (value); + } + + static void +-- +2.43.0 + diff --git a/libhandy.spec b/libhandy.spec index 2bda199..c09363b 100644 --- a/libhandy.spec +++ b/libhandy.spec @@ -2,7 +2,7 @@ Name: libhandy Version: 1.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Building blocks for modern adaptive GNOME apps License: LGPLv2+ @@ -10,6 +10,11 @@ URL: https://gitlab.gnome.org/GNOME/libhandy %global majmin %(echo %{version} | cut -d . -f -2) Source0: https://download.gnome.org/sources/%{name}/%{majmin}/%{name}-%{version}.tar.xz +# Backported from upstream +# https://gitlab.gnome.org/GNOME/libhandy/-/commit/7e8a8529c4d79119d0f0acd81b1f1dbbd558978f +# https://bugzilla.redhat.com/show_bug.cgi?id=2253814 +Patch: 0001-Revert-settings-Always-free-variant.patch + BuildRequires: gcc BuildRequires: gi-docgen BuildRequires: meson @@ -101,6 +106,9 @@ developing applications that use %{name}. %changelog +* Sun Dec 10 2023 Kalev Lember - 1.8.2-5 +- Backport an upstream patch to fix a write after free issue (rhbz#2253814) + * Tue Oct 31 2023 Yaakov Selkowitz - 1.8.2-4 - Disable glade catalog in RHEL builds