[glib/wip/2-58-cve-2021-28153: 3/5] glocalfileoutputstream: Factor out a flag check

[Simon McVittie <smcv src gnome org>]

commit b38fca2149a086b64198dd5b8ffe12209c513ad0
Author: Philip Withnall <pwithnall endlessos org>
Date:   Wed Mar 10 16:05:55 2021 +0000

    glocalfileoutputstream: Factor out a flag check
    
    This clarifies the code a little. It introduces no functional changes.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>
    (cherry picked from commit ce0eb088a68171eed3ac217cb92a72e36eb57d1b)

 gio/glocalfileoutputstream.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c
index 8a68be3de..8e0e793ff 100644
--- a/gio/glocalfileoutputstream.c
+++ b/gio/glocalfileoutputstream.c
@@ -751,6 +751,7 @@ handle_overwrite_open (const char    *filename,
   int res;
   int mode;
   int errsv;
+  gboolean replace_destination_set = (flags & G_FILE_CREATE_REPLACE_DESTINATION);
 
   mode = mode_from_flags_or_info (flags, reference_info);
 
@@ -858,7 +859,7 @@ handle_overwrite_open (const char    *filename,
    * to a backup file and rewrite the contents of the file.
    */
   
-  if ((flags & G_FILE_CREATE_REPLACE_DESTINATION) ||
+  if (replace_destination_set ||
       (!(original_stat.st_nlink > 1) && !is_symlink))
     {
       char *dirname, *tmp_filename;
@@ -877,7 +878,7 @@ handle_overwrite_open (const char    *filename,
       
       /* try to keep permissions (unless replacing) */
 
-      if ( ! (flags & G_FILE_CREATE_REPLACE_DESTINATION) &&
+      if (!replace_destination_set &&
           (
 #ifdef HAVE_FCHOWN
            fchown (tmpfd, original_stat.st_uid, original_stat.st_gid) == -1 ||
@@ -1016,7 +1017,7 @@ handle_overwrite_open (const char    *filename,
        }
     }
 
-  if (flags & G_FILE_CREATE_REPLACE_DESTINATION)
+  if (replace_destination_set)
     {
       g_close (fd, NULL);