luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-26 12:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

bookmarkfile: Don't move an item if the uri has not changed

Browse Source 
This was causing a crash, because we were first removing an item, freeing
both the instance itself and the key, and then trying to reuse those.

So, in this case, instead of reassigning an item, we can just return TRUE
as we have already the item at the right place, while it's not needed to
update the modified timestamp, since no modification happened in reality.

Fixes #1588
This commit is contained in:
Marco Trevisan (Treviño) 2018-11-05 17:15:32 -06:00
parent 94edafb5fa
commit 821d28024b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gbookmarkfile.c
View File

@ -3584,6 +3584,9 @@ g_bookmark_file_move_item (GBookmarkFile *bookmark,
if (new_uri && new_uri[0] != '\0') if (new_uri && new_uri[0] != '\0')
{ {
if (g_strcmp0 (old_uri, new_uri) == 0)
return TRUE;
if (g_bookmark_file_has_item (bookmark, new_uri)) if (g_bookmark_file_has_item (bookmark, new_uri))
{ {
if (!g_bookmark_file_remove_item (bookmark, new_uri, error)) if (!g_bookmark_file_remove_item (bookmark, new_uri, error))