uri: fix behaviour for merging uris ending in .. without following /

https://bugzilla.gnome.org/show_bug.cgi?id=757065
This commit is contained in:
Florin Apostol 2015-10-24 16:52:44 +01:00 committed by Sebastian Dröge
parent c385042483
commit 365f2a130f

View file

@ -1238,7 +1238,12 @@ _remove_dot_segments (GList * path)
out = g_list_delete_link (out, prev);
}
g_free (elem->data);
out = g_list_delete_link (out, elem);
if (next != NULL) {
out = g_list_delete_link (out, elem);
} else {
/* path ends in '/..' We need to keep the last '/' */
elem->data = NULL;
}
}
}