Changeset 7c7b0cb

Timestamp:

Apr 8, 2019 3:37:20 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

488e89a

Parents:

6aeb89c

Message:

Util: Fix memory leak in compressor (ticket #2471)

Location:

core/java/src/net/i2p/util

Files:

• ResettableGZIPInputStream.java (modified) (1 diff)
• ResettableGZIPOutputStream.java (modified) (6 diffs)
• ReusableGZIPInputStream.java (modified) (3 diffs)
• ReusableGZIPOutputStream.java (modified) (2 diffs)

core/java/src/net/i2p/util/ResettableGZIPInputStream.java

@@ -167 +167 @@
             return true;
         }
+    }
+
+    /**
+     *  Calls super.close(). May not be reused after this.
+     *  @since 0.9.40
+     */
+    public void destroy() throws IOException {
+        close();
+        super.close();
     }
 

core/java/src/net/i2p/util/ResettableGZIPOutputStream.java

@@ -19 +19 @@
     /** has the header been written out yet? */
     private boolean _headerWritten;
+    private boolean _footerWritten;
     /** how much data is in the uncompressed stream? */
     private long _writtenSize;
@@ -40 +41 @@
         _writtenSize = 0;
         _headerWritten = false;
+        _footerWritten = false;
     }
     
@@ -62 +64 @@
     
     private void writeFooter() throws IOException {
+        if (_footerWritten) return;
         // damn RFC writing their bytes backwards...
         long crcVal = _crc32.getValue();
@@ -84 +87 @@
             System.out.println();
         }
+        _footerWritten = true;
+    }
+
+    /**
+     *  Calls super.close(). May not be reused after this.
+     *  @since 0.9.40
+     */
+    public void destroy() throws IOException {
+        def.end();
+        super.close();
     }
     
@@ -91 +104 @@
         super.close();
     }
+
     @Override
     public void finish() throws IOException {
@@ -105 +119 @@
         super.write(b);
     }
+
     @Override
     public void write(byte buf[]) throws IOException {
         write(buf, 0, buf.length);
     }
+
     @Override
     public void write(byte buf[], int off, int len) throws IOException {

core/java/src/net/i2p/util/ReusableGZIPInputStream.java

@@ -1 +1 @@
 package net.i2p.util;
 
+import java.io.IOException;
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -33 +34 @@
         return rv;
     }
+
     /**
      * Release an instance back into the cache (this will reset the 
@@ -38 +40 @@
      */
     public static void release(ReusableGZIPInputStream released) {
-        if (ENABLE_CACHING)
-            _available.offer(released);
+        boolean cached;
+        if (ENABLE_CACHING) {
+            cached = _available.offer(released);
+        } else {
+            cached = false;
+        }
+        if (!cached) {
+            try { released.destroy(); } catch (IOException ioe) {}
+        }
     }
     

core/java/src/net/i2p/util/ReusableGZIPOutputStream.java

@@ -3 +3 @@
 //import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.zip.Deflater;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -51 +52 @@
      */
     public static void release(ReusableGZIPOutputStream out) {
-        out.reset();
-        if (ENABLE_CACHING)
-            _available.offer(out);
+        boolean cached;
+        if (ENABLE_CACHING) {
+            out.reset();
+            cached = _available.offer(out);
+        } else {
+            cached = false;
+        }
+        if (!cached) {
+            try { out.destroy(); } catch (IOException ioe) {}
+        }
     }