From db2dd8434e84b54b4196cd7e804ceae13f0c5ea7 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 12 Nov 2016 15:40:10 +0100 Subject: [PATCH 1/2] finish_writing_to_file_impl(): Remove temporary file if replacing the existing one failed Signed-off-by: David Goulet --- 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 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; - } } } From 6b13612eef50283af8c52b160553b192eec9ed6e Mon Sep 17 00:00:00 2001 From: David Goulet Date: Wed, 16 Nov 2016 11:28:24 -0500 Subject: [PATCH 2/2] doc: Add change file for bug #20646 Signed-off-by: David Goulet --- changes/bug20646 | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changes/bug20646 diff --git a/changes/bug20646 b/changes/bug20646 new file mode 100644 index 0000000000..42e319ffcb --- /dev/null +++ b/changes/bug20646 @@ -0,0 +1,5 @@ + o Minor bugfix (util) + - When finishing writing a file to disk, if we were about to replace the + file with the temporary file created before and we fail to replace it, + remove the temporary file so it doesn't stay on disk. Closes #20646; + bugfix on tor-0.2.0.7-alpha; Patch by fk.