summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Palus2023-05-20 22:46:33 (GMT)
committerJan Palus2023-05-20 22:46:33 (GMT)
commitb9ee0390a9e9317571323deea0c099d834b92abb (patch)
treeb3a59762e34204e4cb8438e05e15a1b8cfbcd8d4
parentd7cfdc9bf15c5b500e0da16a0b3ae7bac704d298 (diff)
downloadmate-session-manager-master.zip
mate-session-manager-master.tar.gz
fix double free introduced in 1.26.1; rel 2HEADauto/th/mate-session-manager-1.26.1-2master
see https://github.com/mate-desktop/mate-session-manager/issues/304
-rw-r--r--double-free.patch23
-rw-r--r--mate-session-manager.spec4
2 files changed, 26 insertions, 1 deletions
diff --git a/double-free.patch b/double-free.patch
new file mode 100644
index 0000000..dacdbd0
--- /dev/null
+++ b/double-free.patch
@@ -0,0 +1,23 @@
+From b6d1d7808888f921bcb0abca075828b842de81b8 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Sun, 21 May 2023 00:30:29 +0200
+Subject: [PATCH] main: fix double free on gl_renderer
+
+Fixes: 1263384 ("mate-session: fix memory leak")
+Fixes: #304
+---
+ mate-session/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/mate-session/main.c b/mate-session/main.c
+index fc2148e8..68e38647 100644
+--- a/mate-session/main.c
++++ b/mate-session/main.c
+@@ -759,7 +759,6 @@ int main(int argc, char** argv)
+
+ gsm_xsmp_server_start(xsmp_server);
+ _gsm_manager_set_renderer (manager, gl_renderer);
+- g_free (gl_renderer);
+ gsm_manager_start(manager);
+
+ gtk_main();
diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index 37fb0f8..a805cfd 100644
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -11,11 +11,12 @@ Summary: MATE Desktop session manager
Summary(pl.UTF-8): Zarządca sesji środowiska MATE Desktop
Name: mate-session-manager
Version: 1.26.1
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications
Source0: https://pub.mate-desktop.org/releases/1.26/%{name}-%{version}.tar.xz
# Source0-md5: b3ff2d52219eb2f0f48890d19d1e04ff
+Patch0: double-free.patch
URL: https://wiki.mate-desktop.org/mate-desktop/components/mate-session-manager/
BuildRequires: EGL-devel
BuildRequires: OpenGL-devel
@@ -82,6 +83,7 @@ Dokumentacja API D-Bus MATE Session Managera.
%prep
%setup -q
+%patch0 -p1
%build
%{__aclocal}