diff options
| author | Ray Strode <rstrode@fedoraproject.org> | 2007-09-11 19:48:23 +0000 |
|---|---|---|
| committer | Ray Strode <rstrode@fedoraproject.org> | 2007-09-11 19:48:23 +0000 |
| commit | e9c726582badab4d67ae24847b937e54826c49da (patch) | |
| tree | a8204182d8388388593424cdbc0a24828c8ef615 | |
| parent | f7336aa930f92631ab4b014d46488db0e263442a (diff) | |
| download | metacity-e9c726582badab4d67ae24847b937e54826c49da.tar.gz metacity-e9c726582badab4d67ae24847b937e54826c49da.tar.xz metacity-e9c726582badab4d67ae24847b937e54826c49da.zip | |
- fix crash on logout (and on the subsequent login, bug 243761)metacity-2_19_55-4_fc8
| -rw-r--r-- | metacity-2.18.5-dont-deref-null-pointer.patch | 12 | ||||
| -rw-r--r-- | metacity.spec | 7 |
2 files changed, 18 insertions, 1 deletions
diff --git a/metacity-2.18.5-dont-deref-null-pointer.patch b/metacity-2.18.5-dont-deref-null-pointer.patch new file mode 100644 index 0000000..5c66d18 --- /dev/null +++ b/metacity-2.18.5-dont-deref-null-pointer.patch @@ -0,0 +1,12 @@ +diff -up metacity-2.18.5/src/session.c.dont-deref-null-pointer metacity-2.18.5/src/session.c +--- metacity-2.18.5/src/session.c.dont-deref-null-pointer 2007-09-11 15:41:23.000000000 -0400 ++++ metacity-2.18.5/src/session.c 2007-09-11 15:41:34.000000000 -0400 +@@ -1824,8 +1824,6 @@ warn_about_lame_clients_and_finish_inter + + display_iter = display_iter->next; + } +- /* don't need to free displays */ +- displays = NULL; + + if (lame == NULL) + { diff --git a/metacity.spec b/metacity.spec index 97d79c7..cb7a3b8 100644 --- a/metacity.spec +++ b/metacity.spec @@ -7,10 +7,11 @@ Summary: Metacity window manager Name: metacity Version: %{metacity_version} -Release: 3%{?dist} +Release: 4%{?dist} URL: http://download.gnome.org/sources/metacity/ Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2 Patch0: default-theme.patch +Patch1: metacity-2.18.5-dont-deref-null-pointer.patch License: GPLv2+ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +65,7 @@ API. This package exists purely for technical reasons. %prep %setup -q -n %{metacity_filename} %patch0 -p1 -b .default-theme +%patch1 -p1 -b .dont-deref-null-pointer %build rm -rf $RPM_BUILD_ROOT @@ -150,6 +152,9 @@ fi %{_mandir}/man1/metacity-window-demo.1.gz %changelog +* Tue Sep 11 2007 Ray Strode <rstrode@redhat.com> - 2.19.55-4 +- fix crash on logout (and on the subsequent login, bug 243761) + * Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 2.19.55-3 - Rebuild for build id |