luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-23 17:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-1274-trash-symlinks-glib-2-62' into 'glib-2-62'

Browse Source 
Backport !1274 “trash portal: Don't follow symlinks” to glib-2-62

See merge request GNOME/glib!1276
This commit is contained in:
Philip Withnall
2019-12-11 13:22:17 +00:00
parent facc3a7527 463ccbd587
commit 505e7d6d12
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gtrashportal.c
View File

@@ -86,10 +86,10 @@ g_trash_portal_trash_file (GFile *file,
path = g_file_get_path (file);
fd = g_open (path, O_RDWR | O_CLOEXEC);
fd = g_open (path, O_RDWR | O_CLOEXEC | O_NOFOLLOW);
if (fd == -1 && errno == EISDIR)
/* If it is a directory, fall back to O_PATH */
fd = g_open (path, O_PATH | O_CLOEXEC | O_RDONLY);
fd = g_open (path, O_PATH | O_CLOEXEC | O_RDONLY | O_NOFOLLOW);
errsv = errno;