1 files changed, 26 insertions, 9 deletions
diff --git a/src/Common/libzip/zip_close.c b/src/Common/libzip/zip_close.c
index 26572261..2a9fed25 100644
--- a/src/Common/libzip/zip_close.c
+++ b/src/Common/libzip/zip_close.c
@@ -1,6 +1,6 @@
 /*
   zip_close.c -- close zip archive and update changes
-  Copyright (C) 1999-2018 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2020 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
   The authors can be contacted at <libzip@nih.at>
@@ -73,8 +73,10 @@ zip_close(zip_t *za) {
     if (survivors == 0) {
 	if ((za->open_flags & ZIP_TRUNCATE) || changed) {
 	    if (zip_source_remove(za->src) < 0) {
-		_zip_error_set_from_source(&za->error, za->src);
-		return -1;
+		if (!((zip_error_code_zip(zip_source_error(za->src)) == ZIP_ER_REMOVE) && (zip_error_code_system(zip_source_error(za->src)) == ENOENT))) {
+		    _zip_error_set_from_source(&za->error, za->src);
+		    return -1;
+		}
 	    }
 	}
 	zip_discard(za);
@@ -158,14 +160,23 @@ zip_close(zip_t *za) {
 	}
     }
 
-    _zip_progress_start(za->progress);
+    if (_zip_progress_start(za->progress) != 0) {
+	zip_error_set(&za->error, ZIP_ER_CANCELLED, 0);
+	zip_source_rollback_write(za->src);
+	free(filelist);
+	return -1;
+    }
     error = 0;
     for (j = 0; j < survivors; j++) {
 	int new_data;
 	zip_entry_t *entry;
 	zip_dirent_t *de;
 
-	_zip_progress_subrange(za->progress, (double)j / (double)survivors, (double)(j + 1) / (double)survivors);
+	if (_zip_progress_subrange(za->progress, (double)j / (double)survivors, (double)(j + 1) / (double)survivors) != 0) {
+	    zip_error_set(&za->error, ZIP_ER_CANCELLED, 0);
+	    error = 1;
+	    break;
+	}
 
 	i = filelist[j].idx;
 	entry = za->entry + i;
@@ -256,10 +267,9 @@ zip_close(zip_t *za) {
 	    _zip_error_set_from_source(&za->error, za->src);
 	    error = 1;
 	}
+	_zip_progress_end(za->progress);
     }
 
-    _zip_progress_end(za->progress);
-
     if (error) {
 	zip_source_rollback_write(za->src);
 	return -1;
@@ -543,7 +553,10 @@ copy_data(zip_t *za, zip_uint64_t len) {
 
 	len -= n;
 
-	_zip_progress_update(za->progress, (total - (double)len) / total);
+	if (_zip_progress_update(za->progress, (total - (double)len) / total) != 0) {
+	    zip_error_set(&za->error, ZIP_ER_CANCELLED, 0);
+	    return -1;
+	}
     }
 
     byte_array_fini(buf);
@@ -576,7 +589,11 @@ copy_source(zip_t *za, zip_source_t *src, zip_int64_t data_length) {
 	}
 	if (n == BUFSIZE && za->progress && data_length > 0) {
 	    current += n;
-	    _zip_progress_update(za->progress, (double)current / (double)data_length);
+	    if (_zip_progress_update(za->progress, (double)current / (double)data_length) != 0) {
+		zip_error_set(&za->error, ZIP_ER_CANCELLED, 0);
+		ret = -1;
+		break;
+	    }
 	}
     }