[JENKINS-36871] Found an infinite loop under certain error state disc…

…onnects - Don't think this affected any real protocols, but better to fix after finding
jenkinsci · Aug 2, 2016 · 90425ad · 90425ad
1 parent 7062224
commit 90425ad
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/remoting/protocol/impl/SSLEngineFilterLayer.java b/src/main/java/org/jenkinsci/remoting/protocol/impl/SSLEngineFilterLayer.java
@@ -328,6 +328,11 @@ private void processRead(@NonNull ByteBuffer readBuffer) throws IOException {
                 case NOT_HANDSHAKING: // $FALL-THROUGH$
                 case FINISHED:
                     appBuffer.clear();
+                    if (!tempBuffer.hasRemaining() && handshakeStatus != SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
+                        /* we need more data */
+                        done = true;
+                        break;
+                    }
                     result = sslEngine.unwrap(tempBuffer, appBuffer);
                     processResult(handshakeStatus, result);