diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2019-06-04 10:09:16 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2019-06-04 10:09:16 +0000 |
| commit | 39cbb84e36d4d335d77f4f58fee68a047adf2141 (patch) | |
| tree | 6ea20ec9cc8f10c40c583d0c62ea06e418a8a568 | |
| parent | e4ae836d40df83c7a901e67a6a18d68c70622524 (diff) | |
| parent | e6b769819d63d2b24b251dbc9f902fe6fd614da3 (diff) | |
| download | glib-39cbb84e36d4d335d77f4f58fee68a047adf2141.tar.gz | |
Merge branch 'backport-876-gfile-permissions-glib-2-60' into 'glib-2-60'
Backport !876 “gfile: Limit access to files when copying” to glib-2-60
See merge request GNOME/glib!878
| -rw-r--r-- | gio/gfile.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gio/gfile.c b/gio/gfile.c index 1cc69166a..13b435480 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -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)), FALSE, NULL, flags & G_FILE_COPY_BACKUP, - G_FILE_CREATE_REPLACE_DESTINATION, - info, + G_FILE_CREATE_REPLACE_DESTINATION | + G_FILE_CREATE_PRIVATE, info, cancellable, error); else 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); } else if (flags & G_FILE_COPY_OVERWRITE) @@ -3297,12 +3297,13 @@ file_copy_fallback (GFile *source, out = (GOutputStream *)g_file_replace (destination, NULL, flags & G_FILE_COPY_BACKUP, - G_FILE_CREATE_REPLACE_DESTINATION, + G_FILE_CREATE_REPLACE_DESTINATION | + G_FILE_CREATE_PRIVATE, cancellable, error); } else { - out = (GOutputStream *)g_file_create (destination, 0, cancellable, error); + out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error); } if (!out) |