rpms/metacity/F-7 metacity-2.18.5-dont-deref-null-pointer.patch, NONE, 1.1 metacity.spec, 1.115, 1.116

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/metacity/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23511

Modified Files:
	metacity.spec 
Added Files:
	metacity-2.18.5-dont-deref-null-pointer.patch 
Log Message:
- don't dereference a NULL pointer (crash on logout, leading
  to weird problems on next login, bug 243761)


metacity-2.18.5-dont-deref-null-pointer.patch:

--- NEW FILE metacity-2.18.5-dont-deref-null-pointer.patch ---
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)
     {


Index: metacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/metacity/F-7/metacity.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- metacity.spec	18 Jun 2007 14:01:27 -0000	1.115
+++ metacity.spec	11 Sep 2007 19:44:01 -0000	1.116
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.18/%{metacity_filename}.tar.bz2
 License: GPL
@@ -35,6 +35,8 @@
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
+Patch0: metacity-2.18.5-dont-deref-null-pointer.patch
+
 %description
 
 Metacity is a simple window manager that integrates nicely with 
@@ -56,7 +58,7 @@
 
 %prep
 %setup -q -n %{metacity_filename}
-
+%patch0 -p1 -b .dont-deref-null-pointer
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -141,6 +143,10 @@
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Tue Sep 11 2007 Ray Strode <rstrode at redhat.com> - 2.18.5-2
+- don't dereference a NULL pointer (crash on logout, leading
+  to weird problems on next login, bug 243761)
+
 * Mon Jun 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.5-1
 - Update to 2.18.5, fixing a problem with window activation
   and workspace switching of KDE applications