You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2022/02/09 06:54:41 UTC

[mina] branch 2.0.X updated: Backported a 2.1 patch

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch 2.0.X
in repository https://gitbox.apache.org/repos/asf/mina.git


The following commit(s) were added to refs/heads/2.0.X by this push:
     new 318f226  Backported a 2.1 patch
318f226 is described below

commit 318f226e194acd1918386b7e992ef0970ae8a9be
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Wed Feb 9 07:54:23 2022 +0100

    Backported a 2.1 patch
---
 mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
index 82ba849..dad31c7 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
@@ -785,6 +785,11 @@ class SslHandler {
                 appBuffer.expand(newCapacity);
                 continue;
             }
+
+            if ( inNetBuffer.position() == inNetBuffer.limit()) {
+                // Nothing more in the incoming data, let's get out
+                break;
+            }
         } while (((status == SSLEngineResult.Status.OK) || (status == SSLEngineResult.Status.BUFFER_OVERFLOW))
                 && ((localHandshakeStatus == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) || 
                         (localHandshakeStatus == SSLEngineResult.HandshakeStatus.NEED_UNWRAP)));