- Update to 2.91.3

This commit is contained in:
Bastien Nocera 2010-11-25 12:51:59 +00:00
parent abc9501857
commit 8413d6b154
4 changed files with 6 additions and 40 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ gnome-desktop-2.90.4.tar.bz2
/gnome-desktop-2.91.0.tar.bz2
/gnome-desktop-2.91.1.tar.bz2
/gnome-desktop-2.91.2.tar.bz2
/gnome-desktop-2.91.3.tar.bz2

View File

@ -1,38 +0,0 @@
From 7e967de7dff160d7302b1ab66db3f9054b8373b3 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 11 Nov 2010 13:21:21 +0000
Subject: [PATCH] Fix possible double-free when destroying private windows
This could cause free'ing random data when the members of ->windows
were destroyed, but ->windows itself wasn't. As it was != NULL, we'd
be free memory that wouldn't belong to us anymore.
https://bugzilla.gnome.org/show_bug.cgi?id=634534
---
libgnome-desktop/gnome-rr-labeler.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/libgnome-desktop/gnome-rr-labeler.c b/libgnome-desktop/gnome-rr-labeler.c
index 1de4569..ebf9905 100644
--- a/libgnome-desktop/gnome-rr-labeler.c
+++ b/libgnome-desktop/gnome-rr-labeler.c
@@ -411,11 +411,16 @@ gnome_rr_labeler_hide (GnomeRRLabeler *labeler)
g_return_if_fail (GNOME_IS_RR_LABELER (labeler));
+ if (labeler->windows == NULL)
+ return;
+
for (i = 0; i < labeler->num_outputs; i++)
if (labeler->windows[i] != NULL) {
gtk_widget_destroy (labeler->windows[i]);
labeler->windows[i] = NULL;
}
+ g_free (labeler->windows);
+ labeler->windows = NULL;
}
void
--
1.7.3.2

View File

@ -8,7 +8,7 @@
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop3
Version: 2.91.2
Version: 2.91.3
Release: 1%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.91/gnome-desktop-%{version}.tar.bz2
@ -110,6 +110,9 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gnome-about*
%doc %{_datadir}/gtk-doc/html/gnome-desktop3/
%changelog
* Thu Nov 25 2010 Bastien Nocera <bnocera@redhat.com> 2.91.3-1
- Update to 2.91.3
* Wed Nov 17 2010 Bastien Nocera <bnocera@redhat.com> 2.91.2-1
- Update to 2.91.2

View File

@ -1 +1 @@
a27261cbdc94f1b9447ea0234b4ed1a9 gnome-desktop-2.91.2.tar.bz2
a204082c65e09fc7278f7c401b895d6a gnome-desktop-2.91.3.tar.bz2