You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2016/03/17 10:32:26 UTC

[1/4] commons-compress git commit: test if end() is invoked when stream is closing

Repository: commons-compress
Updated Branches:
  refs/heads/master c02b2d50e -> 6e9acfa66


test if end() is invoked when stream is closing


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/4ae26e42
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/4ae26e42
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/4ae26e42

Branch: refs/heads/master
Commit: 4ae26e42e48c5461a2982dc09be3e958951a8c1d
Parents: a2ba6d5
Author: Rene Preissel <rp...@eToSquare.de>
Authored: Wed Mar 16 22:19:47 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Mar 17 10:27:29 2016 +0100

----------------------------------------------------------------------
 pom.xml                                         | 13 ++++
 .../archivers/sevenz/SevenZNativeHeapTest.java  | 64 ++++++++++++++++++++
 2 files changed, 77 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/4ae26e42/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8cba58e..ffc909e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@ jar, tar, zip, dump, 7z, arj.
     <!-- configuration bits for cutting a release candidate -->
     <commons.release.version>${project.version}</commons.release.version>
     <commons.rc.version>RC1</commons.rc.version>
+    <powermock.version>1.6.4</powermock.version>
   </properties>
 
   <issueManagement>
@@ -65,6 +66,18 @@ jar, tar, zip, dump, 7z, arj.
       <version>1.5</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>${powermock.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>${powermock.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <developers>

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/4ae26e42/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
new file mode 100644
index 0000000..896af8c
--- /dev/null
+++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java
@@ -0,0 +1,64 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.apache.commons.compress.archivers.sevenz;
+
+import org.apache.commons.compress.AbstractTestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(Coders.DeflateDecoder.class)
+public class SevenZNativeHeapTest extends AbstractTestCase {
+
+    @InjectMocks
+    Coders.DeflateDecoder deflateDecoder;
+
+    @Test
+    public void testEndDeflaterOnCloseStream() throws Exception {
+        final Deflater deflater = PowerMockito.spy(new Deflater());
+        PowerMockito.whenNew(Deflater.class).withAnyArguments().thenReturn(deflater);
+
+        final OutputStream outputStream = deflateDecoder.encode(new ByteArrayOutputStream(), 9);
+        outputStream.close();
+
+        Mockito.verify(deflater).end();
+    }
+
+    @Test
+    public void testEndInflaterOnCloseStream() throws Exception {
+        final Inflater inflater = PowerMockito.spy(new Inflater());
+        PowerMockito.whenNew(Inflater.class).withAnyArguments().thenReturn(inflater);
+
+        final InputStream inputStream = deflateDecoder.decode("dummy",new ByteArrayInputStream(new byte[0]),0,null,null);
+        inputStream.close();
+
+        Mockito.verify(inflater).end();
+    }
+}


[4/4] commons-compress git commit: record fix for COMPRESS-343

Posted by bo...@apache.org.
record fix for COMPRESS-343

closes #11


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/6e9acfa6
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/6e9acfa6
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/6e9acfa6

Branch: refs/heads/master
Commit: 6e9acfa668f1a10bc8cb9a3542531f8ae3e043ff
Parents: 73ec9c1
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Mar 17 10:32:00 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Mar 17 10:32:00 2016 +0100

----------------------------------------------------------------------
 src/changes/changes.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/6e9acfa6/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e97f690..809aa08 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -44,6 +44,10 @@ The <action> type attribute can be add,update,fix,remove.
   <body>
     <release version="1.11" date="not released, yet"
              description="Release 1.11">
+      <action issue="COMPRESS-343" type="fix" date="2016-03-17"
+              due-to="Rene Preissel">
+        Native Memory Leak in Sevenz-DeflateDecoder.
+      </action>
       <action type="add" date="2016-03-05"
               due-to="Matt Hovey">
         When using Zip64Mode.Always also use ZIP64 extensions inside


[3/4] commons-compress git commit: COMPRESS-343 try to free native memory even if close fails

Posted by bo...@apache.org.
COMPRESS-343 try to free native memory even if close fails


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/73ec9c12
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/73ec9c12
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/73ec9c12

Branch: refs/heads/master
Commit: 73ec9c125fc4cafada4434b02d603d41e092b675
Parents: 4ae26e4
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Mar 17 10:31:34 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Mar 17 10:31:34 2016 +0100

----------------------------------------------------------------------
 .../commons/compress/archivers/sevenz/Coders.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/73ec9c12/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
index f67accc..06802e4 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
@@ -175,8 +175,11 @@ class Coders {
 
                 @Override
                 public void close() throws IOException {
-                    inflaterInputStream.close();
-                    inflater.end();
+                    try {
+                        inflaterInputStream.close();
+                    } finally {
+                        inflater.end();
+                    }
                 }
             };
         }
@@ -203,8 +206,11 @@ class Coders {
 
                 @Override
                 public void close() throws IOException {
-                    deflaterOutputStream.close();
-                    deflater.end();
+                    try {
+                        deflaterOutputStream.close();
+                    } finally {
+                        deflater.end();
+                    }
                 }
             };
         }


[2/4] commons-compress git commit: Bugfix for COMPRESS-343

Posted by bo...@apache.org.
Bugfix for COMPRESS-343


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/a2ba6d54
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/a2ba6d54
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/a2ba6d54

Branch: refs/heads/master
Commit: a2ba6d54852aceda5e3bf9285730da743ef04e77
Parents: c02b2d5
Author: Rene Preissel <rp...@eToSquare.de>
Authored: Wed Mar 16 17:26:57 2016 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Mar 17 10:27:29 2016 +0100

----------------------------------------------------------------------
 .../compress/archivers/sevenz/Coders.java       | 52 ++++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/a2ba6d54/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
index fad904c..f67accc 100644
--- a/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
+++ b/src/main/java/org/apache/commons/compress/archivers/sevenz/Coders.java
@@ -154,13 +154,59 @@ class Coders {
         InputStream decode(final String archiveName, final InputStream in, long uncompressedLength,
                 final Coder coder, final byte[] password)
             throws IOException {
-            return new InflaterInputStream(new DummyByteAddingInputStream(in),
-                                           new Inflater(true));
+            final Inflater inflater = new Inflater(true);
+            final InflaterInputStream inflaterInputStream = new InflaterInputStream(new DummyByteAddingInputStream(in),
+                    inflater);
+            return new InputStream() {
+                @Override
+                public int read() throws IOException {
+                    return inflaterInputStream.read();
+                }
+
+                @Override
+                public int read(byte[] b, int off, int len) throws IOException {
+                    return inflaterInputStream.read(b, off, len);
+                }
+
+                @Override
+                public int read(byte[] b) throws IOException {
+                    return inflaterInputStream.read(b);
+                }
+
+                @Override
+                public void close() throws IOException {
+                    inflaterInputStream.close();
+                    inflater.end();
+                }
+            };
         }
         @Override
         OutputStream encode(final OutputStream out, final Object options) {
             int level = numberOptionOrDefault(options, 9);
-            return new DeflaterOutputStream(out, new Deflater(level, true));
+            final Deflater deflater = new Deflater(level, true);
+            final DeflaterOutputStream deflaterOutputStream = new DeflaterOutputStream(out, deflater);
+            return new OutputStream() {
+                @Override
+                public void write(int b) throws IOException {
+                    deflaterOutputStream.write(b);
+                }
+
+                @Override
+                public void write(byte[] b) throws IOException {
+                    deflaterOutputStream.write(b);
+                }
+
+                @Override
+                public void write(byte[] b, int off, int len) throws IOException {
+                    deflaterOutputStream.write(b, off, len);
+                }
+
+                @Override
+                public void close() throws IOException {
+                    deflaterOutputStream.close();
+                    deflater.end();
+                }
+            };
         }
     }