From: Remi Collet <remi@php.net>
Date: Mon, 9 Mar 2020 08:29:34 +0000 (+0100)
Subject: proper fix
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5c1359f57e6745b2176275ccba966663fbcdb4b;p=php

proper fix
---

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index d8e1f285a9..a63bef6b7b 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1506,8 +1506,6 @@ static ZIPARCHIVE_METHOD(close)
 	if (err) {
 #if LIBZIP_VERSION_MAJOR == 1 && LIBZIP_VERSION_MINOR == 3 && LIBZIP_VERSION_MICRO == 1
 		php_error_docref(NULL, E_WARNING, "zip_close have failed");
-		ze_obj->err_zip = 0;
-		ze_obj->err_sys = 0;
 #else
 		php_error_docref(NULL, E_WARNING, "%s", zip_strerror(intern));
 		/* Save error for property reader */
@@ -1525,6 +1523,9 @@ static ZIPARCHIVE_METHOD(close)
 		#endif
 		zip_discard(intern);
 #endif
+	} else {
+		ze_obj->err_zip = 0;
+		ze_obj->err_sys = 0;
 	}
 
 	efree(ze_obj->filename);