Issue #6470 - prevent EOF being released back into pool

lachlan-roberts · lachlan-roberts · commit 039a539aa027 · 2021-06-30T16:39:00.000+10:00
Signed-off-by: Lachlan Roberts &lt;lachlan@webtide.com&gt;
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/message/MessageInputStream.java
@@ -163,7 +163,8 @@ public void close()
 
             for (ByteBuffer buffer : buffers)
             {
-                bufferPool.release(buffer);
+                if (buffer != null && buffer != EOF)
+                    bufferPool.release(buffer);
             }
 
             activeBuffer = null;
@@ -259,7 +260,8 @@ public int read(byte[] b, int off, int len) throws IOException
                 synchronized (this)
                 {
                     // Release buffer back to pool.
-                    bufferPool.release(activeBuffer);
+                    if (activeBuffer != null && activeBuffer != EOF)
+                        bufferPool.release(activeBuffer);
                     activeBuffer = null;
 
                     switch (state)

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,8 @@ public void close()`
`163`	`163`
`164`	`164`	`for (ByteBuffer buffer : buffers)`
`165`	`165`	`{`
`166`		`- bufferPool.release(buffer);`
	`166`	`+ if (buffer != null && buffer != EOF)`
	`167`	`+ bufferPool.release(buffer);`
`167`	`168`	`}`
`168`	`169`
`169`	`170`	`activeBuffer = null;`
`@@ -259,7 +260,8 @@ public int read(byte[] b, int off, int len) throws IOException`
`259`	`260`	`synchronized (this)`
`260`	`261`	`{`
`261`	`262`	`// Release buffer back to pool.`
`262`		`- bufferPool.release(activeBuffer);`
	`263`	`+ if (activeBuffer != null && activeBuffer != EOF)`
	`264`	`+ bufferPool.release(activeBuffer);`
`263`	`265`	`activeBuffer = null;`
`264`	`266`
`265`	`267`	`switch (state)`