diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/desktop_file.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2006-11-06 Ray Strode <rstrode@redhat.com> + * src/desktop_file.c: + move g_free inside if branch to prevent a double free in + the else case. Patch from Pascal Terjan (gnome bug + 345309) + +2006-11-06 Ray Strode <rstrode@redhat.com> + * src/validate.c: fix category typos: TeminalEmulator -> TerminalEmulator ScreenSaver -> Screensaver diff --git a/src/desktop_file.c b/src/desktop_file.c index bd8a058..18f8db4 100644 --- a/src/desktop_file.c +++ b/src/desktop_file.c @@ -1181,12 +1181,12 @@ gnome_desktop_file_get_locale_string (GnomeDesktopFile *df, const char *encoding; encoding = desktop_file_get_encoding_for_locale (used_locale); - g_free (used_locale); if (encoding) { char *res; + g_free (used_locale); error = NULL; res = g_convert (raw, -1, "UTF-8", |