[UNDERTOW-2574] At AbstractFramedChannel, also cover for the case where framedDataRemaining is zero and the last frame has been received, plus, make sure we are closing the buffer even if readData is null

Signed-off-by: Flavia Rainone <[email protected]>

Author: fl4via

core/src/main/java/io/undertow/server/protocol/framed/AbstractFramedChannel.java

@@ -430,6 +430,9 @@ public synchronized R receive() throws IOException {
                         readData = null;
                     }
                     if(frameDataRemaining == 0) {
+                        if (isLastFrameReceived()) {
+                            forceFree = true;
+                        }
                         receiver = null;
                     }
                     return null;
@@ -503,16 +506,21 @@ public synchronized R receive() throws IOException {
         }finally {
             //if the receive caused the channel to break the close listener may be have been called
             //which will make readData null
-            if (readData != null) {
-                if (!pooled.getBuffer().hasRemaining() || forceFree) {
-                    if(pooled.getBuffer().capacity() < 1024 || forceFree) {
-                        //if there is less than 1k left we don't allow it to be re-aquired
-                        readData = null;
+            if (readData != null || pooled != null) {
+                if (pooled.isOpen()) {
+                    try {
+                        if (forceFree || !pooled.getBuffer().hasRemaining()) {
+                            if (forceFree || pooled.getBuffer().capacity() < 1024) {
+                                //if there is less than 1k left we don't allow it to be re-aquired
+                                readData = null;
+                            }
+                            //even though this is freed we may un-free it if we get a new packet
+                            //this prevents many small reads resulting in a large number of allocated buffers
+                            pooled.close();
+                        }
+                    } catch (IllegalStateException illegalStateException) {
+                        // ignore, it can happen if we are racing with a close that has closed the pooled
                     }
-                    //even though this is freed we may un-free it if we get a new packet
-                    //this prevents many small reads resulting in a large number of allocated buffers
-                    pooled.close();
-
                 }
             }
             if(requiresReinvoke) {