From c19f4fab6edc8bae8f874e314abcab8f168f3262 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Oct 31 2022 14:06:07 +0000
Subject: Backport MR #269 to fix editing recurring events (#2135772)


---

diff --git a/269.patch b/269.patch
new file mode 100644
index 0000000..de9e844
--- /dev/null
+++ b/269.patch
@@ -0,0 +1,41 @@
+From 21e5396bf5d6fe6101bb1c773632e8722fe2f3bb Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 31 Oct 2022 10:57:40 +0100
+Subject: [PATCH] event-editor: Fix possible use-after-free of recurrence until
+ date
+
+The GcalDateSelector returns an internal instance, while the 'until' date/time
+is meant to be an own instance, which is freed by the GcalRecurrence instance
+in its free function. That means the 'until' date/time is supposed to be reffed
+when being assigned into the GcalRecurrence structure.
+
+Closes https://gitlab.gnome.org/GNOME/gnome-calendar/-/issues/892
+---
+ src/gui/event-editor/gcal-schedule-section.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/event-editor/gcal-schedule-section.c b/src/gui/event-editor/gcal-schedule-section.c
+index 2aed8e30..6a051909 100644
+--- a/src/gui/event-editor/gcal-schedule-section.c
++++ b/src/gui/event-editor/gcal-schedule-section.c
+@@ -616,7 +616,7 @@ gcal_schedule_section_apply (GcalEventEditorSection *section)
+       recur->limit_type = gtk_combo_box_get_active (GTK_COMBO_BOX (self->repeat_duration_combo));
+ 
+       if (recur->limit_type == GCAL_RECURRENCE_UNTIL)
+-        recur->limit.until = gcal_date_selector_get_date (GCAL_DATE_SELECTOR (self->until_date_selector));
++        recur->limit.until = g_date_time_ref (gcal_date_selector_get_date (GCAL_DATE_SELECTOR (self->until_date_selector)));
+       else if (recur->limit_type == GCAL_RECURRENCE_COUNT)
+         recur->limit.count = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (self->number_of_occurrences_spin));
+ 
+@@ -821,7 +821,7 @@ gcal_schedule_section_recurrence_changed (GcalScheduleSection *self)
+   recurrence->frequency = gtk_combo_box_get_active (GTK_COMBO_BOX (self->repeat_combo));
+   recurrence->limit_type = gtk_combo_box_get_active (GTK_COMBO_BOX (self->repeat_duration_combo));
+   if (recurrence->limit_type == GCAL_RECURRENCE_UNTIL)
+-    recurrence->limit.until = gcal_date_selector_get_date (GCAL_DATE_SELECTOR (self->until_date_selector));
++    recurrence->limit.until = g_date_time_ref (gcal_date_selector_get_date (GCAL_DATE_SELECTOR (self->until_date_selector)));
+   else if (recurrence->limit_type == GCAL_RECURRENCE_COUNT)
+     recurrence->limit.count = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (self->number_of_occurrences_spin));
+ 
+-- 
+GitLab
+
diff --git a/gnome-calendar.spec b/gnome-calendar.spec
index b2643b7..848c66d 100644
--- a/gnome-calendar.spec
+++ b/gnome-calendar.spec
@@ -15,6 +15,10 @@ License:        GPLv3+
 URL:            https://wiki.gnome.org/Apps/Calendar
 Source0:        https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz
 
+# Backported from upstream
+# https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/269
+Patch0:         269.patch
+
 BuildRequires:  gcc
 BuildRequires:  gettext
 BuildRequires:  gtk-doc