Safe writes: delete temporary file if rename fails

Change error message to "Failed to safe write"
Fixes #1341

diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index cc53a3d318e0196a6694b9a27d5119a672086d19..173ea808fb8679ce76e19123108402fed4455918 100644 (file)
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -1855,8 +1855,9 @@ finish_metadata:
                a->fd = -1;
                if (a->tmpname) {
                        if (rename(a->tmpname, a->name) == -1) {
+                               unlink(a->tmpname);
                                archive_set_error(&a->archive, errno,
-                                   "rename failed");
+                                   "Failed to safe write");
                                ret = ARCHIVE_FATAL;
                        }
                        a->tmpname = NULL;

diff --git a/libarchive/archive_write_disk_windows.c b/libarchive/archive_write_disk_windows.c
index 77e36c4a621dd04b6a4b4e040c5d3df756103560..1d1275df3b5711651d29c3fde79445747de29ec9 100644 (file)
--- a/libarchive/archive_write_disk_windows.c
+++ b/libarchive/archive_write_disk_windows.c
@@ -1281,8 +1281,9 @@ _archive_write_disk_finish_entry(struct archive *_a)
                        /* Windows does not support atomic rename */
                        disk_unlink(a->name);
                        if (_wrename(a->tmpname, a->name) != 0) {
+                               disk_unlink(a->tmpname);
                                archive_set_error(&a->archive, errno,
-                                   "rename failed");
+                                   "Failed to safe write");
                                ret = ARCHIVE_FATAL;
                        }
                        a->tmpname = NULL;