Merge pull request #443 from win32kbase/master

Fix potential file handle leak from zip CRC logic backport

Author: win32kbase

pom.xml

@@ -3,7 +3,7 @@
 	<groupId>me.coley</groupId>
 	<artifactId>recaf</artifactId>
 	<url>https://github.com/Col-E/Recaf/</url>
-	<version>2.21.9</version>
+	<version>2.21.10</version>
 	<name>Recaf</name>
 	<description>A modern java bytecode editor</description>
 	<!-- Variables -->

src/main/java/me/coley/recaf/Recaf.java

@@ -31,7 +31,7 @@
  * @author Matt
  */
 public class Recaf {
-	public static final String VERSION = "2.21.9";
+	public static final String VERSION = "2.21.10";
 	public static final String DOC_URL = "https://col-e.github.io/Recaf-documentation/";
 	public static final int ASM_VERSION = Opcodes.ASM9;
 	private static Controller currentController;

src/main/java/me/coley/recaf/workspace/JarResource.java

@@ -63,19 +63,20 @@ protected Map<String, byte[]> loadClasses() throws IOException {
 				// This may not always be ideal, but this way has one major bonus. It totally ignores CRC validity.
 				// It also ignores a few other zip entry values.
 				// Since somebody can intentionally write bogus data there to crash "ZipInputStream" this way works.
-				ZipFile zf = new ZipFile(getPath().toString());
-				Enumeration<? extends ZipEntry> entries = zf.entries();
-				while (entries.hasMoreElements()) {
-					ZipEntry entry = entries.nextElement();
+				try (ZipFile zf = new ZipFile(getPath().toString())) {
+					Enumeration<? extends ZipEntry> entries = zf.entries();
+					while (entries.hasMoreElements()) {
+						ZipEntry entry = entries.nextElement();
 
-					if (shouldSkip(entry.getName()))
-						continue;
-					if (!loader.isValidClassEntry(entry))
-						continue;
+						if (shouldSkip(entry.getName()))
+							continue;
+						if (!loader.isValidClassEntry(entry))
+							continue;
 
-					InputStream zis = zf.getInputStream(entry);
-					byte[] in = IOUtil.toByteArray(zis);
-					loader.onClass(entry.getName(), in);
+						InputStream zis = zf.getInputStream(entry);
+						byte[] in = IOUtil.toByteArray(zis);
+						loader.onClass(entry.getName(), in);
+					}
 				}
 			}
 		}