rpms/gdm/devel gdm-2.18.0-dont-strcpy-overlapping-strings.patch, NONE, 1.1 gdm.spec, 1.240, 1.241

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29730

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.18.0-dont-strcpy-overlapping-strings.patch 
Log Message:
- don't strcpy overlapping strings (bug 208181).


gdm-2.18.0-dont-strcpy-overlapping-strings.patch:
 gdmlanguages.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE gdm-2.18.0-dont-strcpy-overlapping-strings.patch ---
--- gdm-2.18.0/gui/gdmlanguages.c.dont-strcpy-overlapping-strings	2007-03-29 15:03:42.000000000 -0400
+++ gdm-2.18.0/gui/gdmlanguages.c	2007-03-29 15:05:07.000000000 -0400
@@ -445,7 +445,9 @@
 	if (no_group) {
 		char *p = strchr (name, '|');
 		if (p != NULL) {
-			strcpy (name, p+1);
+			p = g_strdup (p + 1);
+			g_free (name);
+			name = p;
 		}
 	}
 


Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- gdm.spec	27 Mar 2007 19:01:50 -0000	1.240
+++ gdm.spec	29 Mar 2007 19:20:32 -0000	1.241
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.18.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: LGPL/GPL
 Group: User Interface/X
@@ -67,6 +67,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=420610
 Patch34: gdm-2.18.0-add-lowres-fix.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=424229
+Patch35: gdm-2.18.0-dont-strcpy-overlapping-strings.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Prereq: /usr/sbin/useradd
@@ -152,6 +155,7 @@
 %patch32 -p0 -b .a11y-fixes
 %patch33 -p0 -b .pass-ats-to-session
 %patch34 -p1 -b .add-lowres-fix
+%patch35 -p1 -b .dont-strcpy-overlapping-strings
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -372,6 +376,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Thu Mar 29 2007 Ray Strode <rstrode at redhat.com> - 1:2.18.0-7
+- don't strcpy overlapping strings (bug 208181).
+
 * Tue Mar 27 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.18.0-6
 - Hide gdmphotosetup by default, since About Me does the same