[xfce4-settings] Add patch to fix double free. (fixes #670522)
Kevin Fenzi
kevin at fedoraproject.org
Thu Jan 27 22:40:32 UTC 2011
commit 914e41b4948229448af8ce7ed086e06996bc2359
Author: Kevin Fenzi <kevin at tummy.com>
Date: Thu Jan 27 15:40:17 2011 -0700
Add patch to fix double free. (fixes #670522)
xfce4-settings-4.8.0-double-free-fix.patch | 24 ++++++++++++++++++++++++
xfce4-settings.spec | 8 +++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/xfce4-settings-4.8.0-double-free-fix.patch b/xfce4-settings-4.8.0-double-free-fix.patch
new file mode 100644
index 0000000..aa98b44
--- /dev/null
+++ b/xfce4-settings-4.8.0-double-free-fix.patch
@@ -0,0 +1,24 @@
+commit 6c5b2bdd6fd5d733ba3deb968ea3d9193a1038f8
+Author: Jérôme Guelfucci <jeromeg at xfce.org>
+Date: Thu Jan 27 21:48:57 2011 +0100
+
+ Fix double free when setting workspace names (bug #7174).
+
+ xfce4-settings-helper/workspaces.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/xfce4-settings-helper/workspaces.c b/xfce4-settings-helper/workspaces.c
+index 1c66e81..42eb9ac 100644
+--- a/xfce4-settings-helper/workspaces.c
++++ b/xfce4-settings-helper/workspaces.c
+@@ -343,6 +343,10 @@ xfce_workspaces_helper_set_names (XfceWorkspacesHelper *helper)
+ if (name != NULL && *name != '\0')
+ {
+ /* use the existing name */
++ val = g_new0 (GValue, 1);
++ g_value_init (val, G_TYPE_STRING);
++ new_name = g_strdup (name);
++ g_value_take_string (val, new_name);
+ g_ptr_array_add (names, val);
+ continue;
+ }
diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index e2939b7..4eb53a2 100644
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -2,7 +2,7 @@
Name: xfce4-settings
Version: 4.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Settings Manager for Xfce
Group: User Interface/Desktops
@@ -12,6 +12,8 @@ URL: http://www.xfce.org/
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
# use vendor's artwork
Patch0: xfce4-settings-4.6.0-fedora.patch
+# Already commited upstream
+Patch1: xfce4-settings-4.8.0-double-free-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -41,6 +43,7 @@ This package includes the settings manager applications for the Xfce desktop.
%prep
%setup -q
%patch0 -p1 -b .vendor
+%patch1 -p1 -b .double-free
%build
@@ -83,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/xfce*.desktop
%changelog
+* Thu Jan 27 2011 Kevin Fenzi <kevin at tummy.com> - 4.8.0-2
+- Add patch to fix double free. (fixes #670522)
+
* Sun Jan 16 2011 Kevin Fenzi <kevin at tummy.com> - 4.8.0-1
- Update to 4.8.0
More information about the scm-commits
mailing list