#10226 - fix GZIPContentDecoder buffer leak of zero-capacity buffers

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
jetty · Aug 24, 2023 · e07db72 · e07db72
1 parent 997c949
commit e07db72
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/GZIPContentDecoder.java b/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/GZIPContentDecoder.java
@@ -422,6 +422,9 @@ private enum State
      */
     public RetainableByteBuffer acquire(int capacity)
     {
+        // Zero-capacity buffers aren't released, they MUST NOT come from the pool.
+        if (capacity == 0)
+            return RetainableByteBuffer.EMPTY;
         return _pool.acquire(capacity, false);
     }
 }
diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/RetainableByteBuffer.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/RetainableByteBuffer.java
@@ -36,6 +36,11 @@
  */
 public interface RetainableByteBuffer extends Retainable
 {
+    /**
+     * A Zero-capacity, non-retainable {@code RetainableByteBuffer}.
+     */
+    public static RetainableByteBuffer EMPTY = wrap(BufferUtil.EMPTY_BUFFER);
+
     /**
      * <p>Returns a non-retainable {@code RetainableByteBuffer} that wraps
      * the given {@code ByteBuffer}.</p>