summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2007-04-02 05:23:29 +0000
committerBrian Cameron <bcameron@src.gnome.org>2007-04-02 05:23:29 +0000
commit5975a2f57f8b87322b6e5626039112fe1e275911 (patch)
treeb0512644612a1a71e9a692adc776562204c53943
parent06916f6abf2c0306beb390f85a9734be06476c1e (diff)
downloadgdm-5975a2f57f8b87322b6e5626039112fe1e275911.tar.gz
Fix strcpy so source and destination do not overlap. Fixes bug #424299.
2006-04-02 Brian Cameron <brian.cameron@sun.com> * gui/gdmlanguages.c: Fix strcpy so source and destination do not overlap. Fixes bug #424299. Patch by Ray Strode <rstrode@redhat.com>. svn path=/branches/gnome-2-16/; revision=4741
-rw-r--r--ChangeLog6
-rw-r--r--gui/gdmlanguages.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bcd55d15..3cba038b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-02 Brian Cameron <brian.cameron@sun.com>
+
+ * gui/gdmlanguages.c: Fix strcpy so source and destination do not
+ overlap. Fixes bug #424299. Patch by Ray Strode
+ <rstrode@redhat.com>.
+
2006-03-27 Brian Cameron <brian.cameron@sun.com>
* gui/greeter/greeter_item.c, gui/greeter/greeter.c: Back out
diff --git a/gui/gdmlanguages.c b/gui/gdmlanguages.c
index e5b2a021..0bcce557 100644
--- a/gui/gdmlanguages.c
+++ b/gui/gdmlanguages.c
@@ -387,7 +387,9 @@ gdm_lang_name (const char *language,
if (no_group) {
char *p = strchr (name, '|');
if (p != NULL) {
- strcpy (name, p+1);
+ p = g_strdup (p + 1);
+ g_free (name);
+ name = p;
}
}