svn commit: r1886853 - /subversion/trunk/subversion/libsvn_subr/stream.c

[ko...@apache.org]

Author: kotkov
Date: Tue Feb 23 18:44:10 2021
New Revision: 1886853

URL: http://svn.apache.org/viewvc?rev=1886853&view=rev
Log:
Following up on r1886774, ensure that when we close the file in the install
stream, the corresponding `file` field is always set to NULL.

In other words, keep the internal state consistent, even though we don't
currently retry calls such as svn_stream__install_stream() or
svn_stream__install_delete().

* subversion/libsvn_subr/stream.c
  (install_stream_close_file): New helper function.  Close the underlying file
   of the install stream and set the corresponding `file` field to NULL.
  (svn_stream__install_finalize,
   svn_stream__install_stream,
   svn_stream__install_delete): Use the new helper to close the file.

Modified:
    subversion/trunk/subversion/libsvn_subr/stream.c

Modified: subversion/trunk/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/stream.c?rev=1886853&r1=1886852&r2=1886853&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/stream.c (original)
+++ subversion/trunk/subversion/libsvn_subr/stream.c Tue Feb 23 18:44:10 2021
@@ -2353,6 +2353,21 @@ svn_stream__install_set_affected_time(sv
   ib->set_mtime = mtime;
 }
 
+/* Helper function that closes the underlying file of the install stream
+   and update the state in the baton. */
+static svn_error_t *
+install_stream_close_file(struct install_baton_t *ib,
+                          apr_pool_t *scratch_pool)
+{
+  if (ib->baton_apr.file)
+    {
+      SVN_ERR(svn_io_file_close(ib->baton_apr.file, scratch_pool));
+      ib->baton_apr.file = NULL;
+    }
+
+  return SVN_NO_ERROR;
+}
+
 svn_error_t *
 svn_stream__install_finalize(apr_time_t *mtime_p,
                              apr_off_t *size_p,
@@ -2438,8 +2453,7 @@ svn_stream__install_finalize(apr_time_t
 
   if (!finalized)
     {
-      SVN_ERR(svn_io_file_close(ib->baton_apr.file, scratch_pool));
-      ib->baton_apr.file = NULL;
+      SVN_ERR(install_stream_close_file(ib, scratch_pool));
 
       if (ib->set_read_only)
         SVN_ERR(svn_io_set_file_read_only(ib->tmp_path, FALSE,
@@ -2530,13 +2544,12 @@ svn_stream__install_stream(svn_stream_t
           }
         else
           {
-            return svn_error_compose_create(err,
-                                            svn_io_file_close(ib->baton_apr.file,
-                                                              scratch_pool));
+            return svn_error_compose_create(
+                     err, install_stream_close_file(ib, scratch_pool));
           }
 #endif
 
-        SVN_ERR(svn_io_file_close(ib->baton_apr.file, scratch_pool));
+        SVN_ERR(install_stream_close_file(ib, scratch_pool));
     }
 
   err = svn_io_file_rename2(ib->tmp_path, final_abspath, FALSE, scratch_pool);
@@ -2582,7 +2595,7 @@ svn_stream__install_delete(svn_stream_t
                                              scratch_pool);
       if (err == SVN_NO_ERROR)
         {
-          SVN_ERR(svn_io_file_close(ib->baton_apr.file, scratch_pool));
+          SVN_ERR(install_stream_close_file(ib, scratch_pool));
           return SVN_NO_ERROR; /* File is already gone */
         }
 
@@ -2591,7 +2604,7 @@ svn_stream__install_delete(svn_stream_t
       svn_error_clear(err);
 #endif
 
-      SVN_ERR(svn_io_file_close(ib->baton_apr.file, scratch_pool));
+      SVN_ERR(install_stream_close_file(ib, scratch_pool));
     }
 
   return svn_error_trace(svn_io_remove_file2(ib->tmp_path, FALSE,