From 82a7417a9d32df2efb8ec228f2ffea8c07302908 Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Thu, 1 Aug 2024 23:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DZipUtil.zip=E5=8E=8B=E7=BC=A9?=
 =?UTF-8?q?=E5=88=B0=E6=9C=AC=E7=9B=AE=E5=BD=95=E6=97=B6=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E6=AD=BB=E5=BE=AA=E7=8E=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hutool/core/compress/ZipWriter.java       |  7 ++++
 .../hutool/core/compress/IssueIAGYDGTest.java | 32 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueIAGYDGTest.java

diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java
index 4d05764d0..b6d5fbae8 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java
@@ -59,6 +59,7 @@ public class ZipWriter implements Closeable {
 		return new ZipWriter(out, charset);
 	}
 
+	private File zipFile;
 	private final ZipOutputStream out;
 
 	/**
@@ -75,6 +76,7 @@ public class ZipWriter implements Closeable {
 	 */
 	public ZipWriter(final File zipFile, final Charset charset) {
 		this(getZipOutputStream(zipFile, charset));
+		this.zipFile = zipFile;
 	}
 
 	/**
@@ -296,6 +298,11 @@ public class ZipWriter implements Closeable {
 				}
 			}
 		} else {
+			// issue#IAGYDG 检查加入的文件是否为压缩结果文件本身，避免死循环
+			if (FileUtil.equals(file, zipFile)) {
+				return;
+			}
+
 			// 如果是文件或其它符号，则直接压缩该文件
 			putEntry(subPath, FileUtil.getInputStream(file));
 		}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueIAGYDGTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueIAGYDGTest.java
new file mode 100644
index 000000000..b7cde5516
--- /dev/null
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/compress/IssueIAGYDGTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2024. looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          https://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
+package org.dromara.hutool.core.compress;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+/**
+ * https://gitee.com/dromara/hutool/issues/IAGYDG
+ */
+public class IssueIAGYDGTest {
+	@Test
+	@Disabled
+	void zipTest() {
+		// 第一次压缩后，IssueIAGYDG.zip也会作为文件压缩到IssueIAGYDG.zip中，导致死循环
+		final File filea = new File("d:/test/");
+		final File fileb = new File("d:/test/IssueIAGYDG.zip");
+		ZipUtil.zip(fileb, false, filea.listFiles());
+	}
+}