diff -Nru gnome-control-center-3.34.1/debian/changelog gnome-control-center-3.34.1/debian/changelog --- gnome-control-center-3.34.1/debian/changelog 2019-10-07 15:25:32.000000000 +0000 +++ gnome-control-center-3.34.1/debian/changelog 2019-10-15 15:54:41.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-control-center (1:3.34.1-1ubuntu2) eoan; urgency=medium + + * debian/patches/gitlab_background_segfault.patch: + - patch from Robert Ancell to fix a segfault in the background panel + (lp: #1847103) + + -- Sebastien Bacher Tue, 15 Oct 2019 17:52:51 +0200 + gnome-control-center (1:3.34.1-1ubuntu1) eoan; urgency=medium * Merge with debian unstable. Remaining changes: diff -Nru gnome-control-center-3.34.1/debian/patches/gitlab_background_segfault.patch gnome-control-center-3.34.1/debian/patches/gitlab_background_segfault.patch --- gnome-control-center-3.34.1/debian/patches/gitlab_background_segfault.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.34.1/debian/patches/gitlab_background_segfault.patch 2019-10-15 15:54:46.000000000 +0000 @@ -0,0 +1,37 @@ +From 1319a67ee4c4fb4ac712e113114587fc59e8eb96 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Tue, 15 Oct 2019 17:03:58 +1300 +Subject: [PATCH] background: Fix crash if a BgRecentSource is unreffed during + an async operation + +The BG_RECENT_SOURCE (user_data) call was done before it was checked if is was +cancelled. At this point user_data is pointing to an object that has been deleted. + +Fixes #729 +--- + panels/background/bg-recent-source.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/panels/background/bg-recent-source.c b/panels/background/bg-recent-source.c +index 44eec5564..13e583fdc 100644 +--- a/panels/background/bg-recent-source.c ++++ b/panels/background/bg-recent-source.c +@@ -264,7 +264,7 @@ enumerate_children_finished_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) + { +- BgRecentSource *self = BG_RECENT_SOURCE (user_data); ++ BgRecentSource *self; + g_autoptr(GFileEnumerator) enumerator = NULL; + g_autoptr(GError) error = NULL; + +@@ -277,6 +277,7 @@ enumerate_children_finished_cb (GObject *source, + return; + } + ++ self = BG_RECENT_SOURCE (user_data); + g_file_enumerator_next_files_async (enumerator, + G_MAXINT, + G_PRIORITY_DEFAULT, +-- + diff -Nru gnome-control-center-3.34.1/debian/patches/series gnome-control-center-3.34.1/debian/patches/series --- gnome-control-center-3.34.1/debian/patches/series 2019-10-07 15:22:21.000000000 +0000 +++ gnome-control-center-3.34.1/debian/patches/series 2019-10-15 15:54:46.000000000 +0000 @@ -25,3 +25,4 @@ 0008-applications-Add-hack-detect-snaps-before-X-SnapInst.patch display-Support-UI-scaled-logical-monitor-mode.patch ubuntu_privacy_hide_buggy_controls.patch +gitlab_background_segfault.patch