From a99f92dd6a741e61ce9fca7fb87b77db640e8153 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 7 Jan 2020 12:05:04 +0100 Subject: [PATCH] Add patch for RH bug #1754321 (alarm-notify: Double-free with certain types of the reminder) --- ...rver-3.35.3-alarm-notify-double-free.patch | 26 +++++++++++++++++++ evolution-data-server.spec | 8 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 evolution-data-server-3.35.3-alarm-notify-double-free.patch diff --git a/evolution-data-server-3.35.3-alarm-notify-double-free.patch b/evolution-data-server-3.35.3-alarm-notify-double-free.patch new file mode 100644 index 0000000..6275f12 --- /dev/null +++ b/evolution-data-server-3.35.3-alarm-notify-double-free.patch @@ -0,0 +1,26 @@ +diff --git a/src/services/evolution-alarm-notify/e-alarm-notify.c b/src/services/evolution-alarm-notify/e-alarm-notify.c +index a97e258b4..7eba95f60 100644 +--- a/src/services/evolution-alarm-notify/e-alarm-notify.c ++++ b/src/services/evolution-alarm-notify/e-alarm-notify.c +@@ -139,8 +139,6 @@ e_alarm_notify_audio (EAlarmNotify *an, + if (!did_play) + gdk_beep (); + +- g_slist_free_full (attachments, g_object_unref); +- + return FALSE; + } + +@@ -456,12 +454,9 @@ e_alarm_notify_procedure (EAlarmNotify *an, + if (!result) + goto fallback; + +- g_slist_free_full (attachments, g_object_unref); +- + return FALSE; + + fallback: +- g_slist_free_full (attachments, g_object_unref); + + return e_alarm_notify_display (an, rd, alarm); + } diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 5860ad4..564a7d6 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -37,12 +37,14 @@ Name: evolution-data-server Version: 3.35.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Backend data server for Evolution License: LGPLv2+ URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.35/%{name}-%{version}.tar.xz +Patch01: evolution-data-server-3.35.3-alarm-notify-double-free.patch + Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -171,6 +173,7 @@ the functionality of the installed %{name} package. %prep %setup -q +%patch01 -p1 -b .alarm-notify-double-free %build @@ -464,6 +467,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_datadir}/installed-tests %changelog +* Tue Jan 07 2020 Milan Crha - 3.35.3-2 +- Add patch for RH bug #1754321 (alarm-notify: Double-free with certain types of the reminder) + * Fri Jan 03 2020 Milan Crha - 3.35.3-1 - Update to 3.35.3