[tor-commits] [tor/master] finish_writing_to_file_impl(): Remove temporary file if replacing the existing one failed

[nickm at torproject.org]

commit db2dd8434e84b54b4196cd7e804ceae13f0c5ea7
Author: Fabian Keil <fk at fabiankeil.de>
Date:   Sat Nov 12 15:40:10 2016 +0100

    finish_writing_to_file_impl(): Remove temporary file if replacing the existing one failed
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/common/util.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index cb5f128..3421d11 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2601,6 +2601,14 @@ finish_writing_to_file_impl(open_file_t *file_data, int abort_write)
 
   if (file_data->rename_on_close) {
     tor_assert(file_data->tempname && file_data->filename);
+    if (!abort_write) {
+      tor_assert(strcmp(file_data->filename, file_data->tempname));
+      if (replace_file(file_data->tempname, file_data->filename)) {
+        log_warn(LD_FS, "Error replacing \"%s\": %s", file_data->filename,
+                 strerror(errno));
+        abort_write = r = -1;
+      }
+    }
     if (abort_write) {
       int res = unlink(file_data->tempname);
       if (res != 0) {
@@ -2609,13 +2617,6 @@ finish_writing_to_file_impl(open_file_t *file_data, int abort_write)
                  file_data->tempname, strerror(errno));
         r = -1;
       }
-    } else {
-      tor_assert(strcmp(file_data->filename, file_data->tempname));
-      if (replace_file(file_data->tempname, file_data->filename)) {
-        log_warn(LD_FS, "Error replacing \"%s\": %s", file_data->filename,
-                 strerror(errno));
-        r = -1;
-      }
     }
   }