diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-04-02 05:22:08 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-04-02 05:22:08 +0000 |
| commit | 63e0ac4d80774ce1298162aeb605c9df98e6b20b (patch) | |
| tree | 57324a29a764a1f5a4025135de0253e716944615 /gui | |
| parent | 1f8ba55f62074f6ae082b0a53c3047820b36a4eb (diff) | |
| download | gdm-63e0ac4d80774ce1298162aeb605c9df98e6b20b.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-18/; revision=4740
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/gdmlanguages.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gui/gdmlanguages.c b/gui/gdmlanguages.c index 4c314c7f..98d2fdcf 100644 --- a/gui/gdmlanguages.c +++ b/gui/gdmlanguages.c @@ -212,11 +212,11 @@ static Language languages [] = { /*Note translate the N-Z to the N-Z you used in the group label */ { N_("N-Z|Serbian"), "sr_YU", "српски", 0 }, /*Note translate the N-Z to the N-Z you used in the group label */ - { N_("N-Z|Serbian (Serbia & Montenegro)"), "sr_CS", "српски", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Serbian (Montenegro)"), "sr_ME", "српски", 0 },
- /*Note translate the N-Z to the N-Z you used in the group label */
- { N_("N-Z|Serbian (Serbia)"), "sr_RS", "српски", 0 },
+ { N_("N-Z|Serbian (Serbia & Montenegro)"), "sr_CS", "српски", 0 }, + /*Note translate the N-Z to the N-Z you used in the group label */ + { N_("N-Z|Serbian (Montenegro)"), "sr_ME", "српски", 0 }, + /*Note translate the N-Z to the N-Z you used in the group label */ + { N_("N-Z|Serbian (Serbia)"), "sr_RS", "српски", 0 }, /*Note translate the N-Z to the N-Z you used in the group label */ { N_("N-Z|Serbian (Latin)"), "sr_CS@Latn", "srpski (latinica)", 0 }, /*Note translate the N-Z to the N-Z you used in the group label */ @@ -441,7 +441,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; } } |