callisto-debian/mate-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debian/patches: Drop patches 0001, 0002 and 0003. All applied upstream.

Browse Source
This commit is contained in:
Mike Gabriel 2023-07-10 06:08:55 +02:00
parent 3befaf22fd
commit 892266bebe
4 changed files with 0 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
debian/patches/0001_mate-bg-fix-memory-leak.patch vendored
View File

@ -1,30 +0,0 @@
From 2fbe25e7ad9c7678db2f3e34f76c9ee4e37d80d9 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 8 Nov 2021 12:44:21 +0100
Subject: [PATCH] mate-bg: fix memory leak
---
libmate-desktop/mate-bg.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c
index e5119759e..62cc5e59e 100644
--- a/libmate-desktop/mate-bg.c
+++ b/libmate-desktop/mate-bg.c
@@ -3197,9 +3197,13 @@ mate_bg_changes_with_time (MateBG *bg)
if (!bg->filename)
return FALSE;
- show = get_as_slideshow (bg, bg->filename);
- if (show)
- return g_queue_get_length (show->slides) > 1;
+ if ((show = get_as_slideshow (bg, bg->filename)) != NULL) {
+ gboolean result;
+
+ result = (g_queue_get_length (show->slides) > 1) ? TRUE : FALSE;
+ slideshow_unref (show);
+ return result;
+ }
return FALSE;
}

21
debian/patches/0002_mate-desktop-thumbnail-fix-memory-leak.patch vendored
View File

@ -1,21 +0,0 @@
From 7f9225f08b84d58ccddbc88c7c4cc176c151fdb9 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Fri, 22 Oct 2021 18:26:52 +0200
Subject: [PATCH] mate-desktop-thumbnail: fix memory leak
---
libmate-desktop/mate-desktop-thumbnail.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
index 8d2670631..885ff420a 100644
--- a/libmate-desktop/mate-desktop-thumbnail.c
+++ b/libmate-desktop/mate-desktop-thumbnail.c
@@ -954,6 +954,7 @@ expand_thumbnailing_script (const char *script,
g_ptr_array_add (array, expanded);
}
+ g_strfreev (script_elems);
if (!got_in)
{

50
debian/patches/0003_revert-small-cleanup.patch vendored
View File

@ -1,50 +0,0 @@
From 6fcc78cd8e5aa807fa9d254d2e61a302096559cf Mon Sep 17 00:00:00 2001
From: Colomban Wendling <cwendling@hypra.fr>
Date: Mon, 7 Nov 2022 11:57:51 +0100
Subject: [PATCH] Revert "[mate-bg] small cleanup"
It is not possible to use the `list` pointer after it has been deleted,
so the "cleanup" this commit made lead to using freed memory if any
item actually got clean up.
This "cleanup" also don't seem meaningful to me, as all it does
otherwise is trade an assignation for a redundant test -- either of
which the compiler might happily optimize out.
This reverts commit 47426c90d10e9f738ecf89f35db94ca8deff55e0.
---
libmate-desktop/mate-bg.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c
index 62cc5e59e..5cf2daf3a 100644
--- a/libmate-desktop/mate-bg.c
+++ b/libmate-desktop/mate-bg.c
@@ -2016,19 +2016,18 @@ static gboolean
blow_expensive_caches (gpointer data)
{
MateBG *bg = data;
- GList *list;
+ GList *list, *next;
bg->blow_caches_id = 0;
- if (bg->file_cache) {
- for (list = bg->file_cache; list != NULL; list = list->next) {
- FileCacheEntry *ent = list->data;
+ for (list = bg->file_cache; list != NULL; list = next) {
+ FileCacheEntry *ent = list->data;
+ next = list->next;
- if (ent->type == PIXBUF) {
- file_cache_entry_delete (ent);
- bg->file_cache = g_list_delete_link (bg->file_cache,
- list);
- }
+ if (ent->type == PIXBUF) {
+ file_cache_entry_delete (ent);
+ bg->file_cache = g_list_delete_link (bg->file_cache,
+ list);
}
}

3
debian/patches/series vendored
View File

@ -1,4 +1 @@
2001_prefer-x-terminal-emulator.patch
0001_mate-bg-fix-memory-leak.patch
0002_mate-desktop-thumbnail-fix-memory-leak.patch
0003_revert-small-cleanup.patch