Fixed a bug in gzip's decompress that didn't close InputStream.

HelenParr · Jul 2, 2020 · 7ede31b · 7ede31b
1 parent abfa0ad
commit 7ede31b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
 
   <groupId>jp.co.yahoo.yosegi</groupId>
   <artifactId>yosegi</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <packaging>jar</packaging>
   <name>Yosegi</name>
   <description>Yosegi package.</description>

diff --git a/src/main/java/jp/co/yahoo/yosegi/compressor/GzipCompressor.java b/src/main/java/jp/co/yahoo/yosegi/compressor/GzipCompressor.java
@@ -101,10 +101,10 @@ public byte[] decompress(
 
     ByteArrayInputStream byteArrayIn =
         new ByteArrayInputStream( data , start + Integer.BYTES , length );
-    GZIPInputStream in = new GZIPInputStream( byteArrayIn , 1024 * 256 );
-
     byte[] retVal = new byte[dataLength];
-    InputStreamUtils.read( in , retVal , 0 , dataLength );
+    try ( GZIPInputStream in = new GZIPInputStream( byteArrayIn , 1024 * 256 ); ) {
+      InputStreamUtils.read( in , retVal , 0 , dataLength );
+    }
 
     return retVal;
   }
@@ -120,9 +120,9 @@ public int decompressAndSet(
 
     ByteArrayInputStream byteArrayIn =
         new ByteArrayInputStream( data , start + Integer.BYTES , length );
-    GZIPInputStream in = new GZIPInputStream( byteArrayIn , 1024 * 256 );
-
-    InputStreamUtils.read( in , buffer , 0 , dataLength );
+    try ( GZIPInputStream in = new GZIPInputStream( byteArrayIn , 1024 * 256 ); ) {
+      InputStreamUtils.read( in , buffer , 0 , dataLength );
+    }
 
     return dataLength;
   }