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

Merge branch 'backport-876-gfile-permissions-glib-2-60' into 'glib-2-60'

Browse Source 
Backport !876 “gfile: Limit access to files when copying” to glib-2-60

See merge request GNOME/glib!878
This commit is contained in:
Philip Withnall
2019-06-04 10:09:16 +00:00
parent e4ae836d40 e6b769819d
commit 39cbb84e36
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gfile.c
View File

@@ -3284,12 +3284,12 @@ file_copy_fallback (GFile *source,
out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)), out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
FALSE, NULL, FALSE, NULL,
flags & G_FILE_COPY_BACKUP, flags & G_FILE_COPY_BACKUP,
G_FILE_CREATE_REPLACE_DESTINATION, G_FILE_CREATE_REPLACE_DESTINATION |
info, G_FILE_CREATE_PRIVATE, info,
cancellable, error); cancellable, error);
else else
out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)), out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
FALSE, 0, info, FALSE, G_FILE_CREATE_PRIVATE, info,
cancellable, error); cancellable, error);
} }
else if (flags & G_FILE_COPY_OVERWRITE) else if (flags & G_FILE_COPY_OVERWRITE)
@@ -3297,12 +3297,13 @@ file_copy_fallback (GFile *source,
out = (GOutputStream *)g_file_replace (destination, out = (GOutputStream *)g_file_replace (destination,
NULL, NULL,
flags & G_FILE_COPY_BACKUP, flags & G_FILE_COPY_BACKUP,
G_FILE_CREATE_REPLACE_DESTINATION, G_FILE_CREATE_REPLACE_DESTINATION |
G_FILE_CREATE_PRIVATE,
cancellable, error); cancellable, error);
} }
else else
{ {
out = (GOutputStream *)g_file_create (destination, 0, cancellable, error); out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error);
} }
if (!out) if (!out)