AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-21 06:20:29 +00:00
Code Issues Projects Releases Wiki Activity

bgo#514843 - [filechooser] Deal with corrupted .gtk-bookmarks gracefully

Browse Source 
We weren't checking for the lines in that file being valid UTF-8 strings.
This commit is contained in:
John Ralls 2011-09-12 14:25:45 -05:00 committed by Federico Mena Quintero
parent 70d70a0607
commit 7550157d66
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkfilesystem.c
View File

@ -264,6 +264,9 @@ read_bookmarks (GFile *file)
if (!*lines[i])
continue;
if (!g_utf8_validate (lines[i], -1, NULL))
continue;
bookmark = g_slice_new0 (GtkFileSystemBookmark);
if ((space = strchr (lines[i], ' ')) != NULL)
@ -289,23 +292,25 @@ save_bookmarks (GFile *bookmarks_file,
{
GError *error = NULL;
GString *contents;
GSList *l;
contents = g_string_new ("");
while (bookmarks)
for (l = bookmarks; l; l = l->next)
{
GtkFileSystemBookmark *bookmark;
GtkFileSystemBookmark *bookmark = l->data;
gchar *uri;
bookmark = bookmarks->data;
uri = g_file_get_uri (bookmark->file);
if (!uri)
continue;
g_string_append (contents, uri);
if (bookmark->label)
g_string_append_printf (contents, " %s", bookmark->label);
g_string_append_c (contents, '\n');
bookmarks = bookmarks->next;
g_free (uri);
}