From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 12 Nov 2016 14:40:10 +0000 (+0100)
Subject: finish_writing_to_file_impl(): Remove temporary file if replacing the existing one... 
X-Git-Tag: tor-0.3.0.1-alpha~121^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db2dd8434e84b54b4196cd7e804ceae13f0c5ea7;p=thirdparty%2Ftor.git

finish_writing_to_file_impl(): Remove temporary file if replacing the existing one failed

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

diff --git a/src/common/util.c b/src/common/util.c
index cb5f12821e..3421d117b0 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;
-      }
     }
   }