netty
diff --git a/‎handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java‎
Lines changed: 2 additions & 0 deletions b/‎handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslEngine.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎handler/src/main/java/io/netty/handler/ssl/SslUtils.java‎
Lines changed: 17 additions & 6 deletions b/‎handler/src/main/java/io/netty/handler/ssl/SslUtils.java‎
Lines changed: 17 additions & 6 deletions
@@ -1202,6 +1202,8 @@ public final SSLEngineResult unwrap(
                     throw new NotSslRecordException("not an SSL/TLS record");
                 }
 
+                assert packetLength >= 0;
+
                 final int packetLengthDataOnly = packetLength - SSL_RECORD_HEADER_LENGTH;
                 if (packetLengthDataOnly > capacity) {
                     // Not enough space in the destination buffer so signal the caller that the buffer needs to be
 
@@ -314,8 +314,12 @@ static SSLHandshakeException toSSLHandshakeException(Throwable e) {
      *                      the given {@link ByteBuf} is not encrypted at all.
      */
     static int getEncryptedPacketLength(ByteBuf buffer, int offset, boolean probeSSLv2) {
+        assert offset >= buffer.readerIndex();
+        int remaining = buffer.writerIndex() - offset;
+        if (remaining < SSL_RECORD_HEADER_LENGTH) {
+            return NOT_ENOUGH_DATA;
+        }
         int packetLength = 0;
-
         // SSLv3 or TLS - Check ContentType
         boolean tls;
         switch (buffer.getUnsignedByte(offset)) {
@@ -346,7 +350,7 @@ static int getEncryptedPacketLength(ByteBuf buffer, int offset, boolean probeSSL
                     tls = false;
                 }
             } else if (version == DTLS_1_0 || version == DTLS_1_2 || version == DTLS_1_3) {
-                if (buffer.readableBytes() < offset + DTLS_RECORD_HEADER_LENGTH) {
+                if (remaining < DTLS_RECORD_HEADER_LENGTH) {
                     return NOT_ENOUGH_DATA;
                 }
                 // length is the last 2 bytes in the 13 byte header.
@@ -367,7 +371,8 @@ static int getEncryptedPacketLength(ByteBuf buffer, int offset, boolean probeSSL
                 packetLength = headerLength == 2 ?
                         (shortBE(buffer, offset) & 0x7FFF) + 2 : (shortBE(buffer, offset) & 0x3FFF) + 3;
                 if (packetLength <= headerLength) {
-                    return NOT_ENOUGH_DATA;
+                    // If there's no data then consider this package as not encrypted.
+                    return NOT_ENCRYPTED;
                 }
             } else {
                 return NOT_ENCRYPTED;
@@ -420,24 +425,29 @@ static int getEncryptedPacketLength(ByteBuffer[] buffers, int offset) {
         }
 
         // We need to copy 5 bytes into a temporary buffer so we can parse out the packet length easily.
-        ByteBuffer tmp = ByteBuffer.allocate(5);
+        ByteBuffer tmp = ByteBuffer.allocate(SSL_RECORD_HEADER_LENGTH);
 
         do {
             buffer = buffers[offset++].duplicate();
             if (buffer.remaining() > tmp.remaining()) {
                 buffer.limit(buffer.position() + tmp.remaining());
             }
             tmp.put(buffer);
-        } while (tmp.hasRemaining());
+        } while (tmp.hasRemaining() && offset < buffers.length);
 
         // Done, flip the buffer so we can read from it.
         tmp.flip();
         return getEncryptedPacketLength(tmp);
     }
 
     private static int getEncryptedPacketLength(ByteBuffer buffer) {
+        int remaining = buffer.remaining();
+        if (remaining < SSL_RECORD_HEADER_LENGTH) {
+            return NOT_ENOUGH_DATA;
+        }
         int packetLength = 0;
         int pos = buffer.position();
+
         // SSLv3 or TLS - Check ContentType
         boolean tls;
         switch (unsignedByte(buffer.get(pos))) {
@@ -478,7 +488,8 @@ private static int getEncryptedPacketLength(ByteBuffer buffer) {
                 packetLength = headerLength == 2 ?
                         (shortBE(buffer, pos) & 0x7FFF) + 2 : (shortBE(buffer, pos) & 0x3FFF) + 3;
                 if (packetLength <= headerLength) {
-                    return NOT_ENOUGH_DATA;
+                    // If there's no data then consider this package as not encrypted.
+                    return NOT_ENCRYPTED;
                 }
             } else {
                 return NOT_ENCRYPTED;
Original file line number	Diff line number	Diff line change
`@@ -1202,6 +1202,8 @@ public final SSLEngineResult unwrap(`
`1202`	`1202`	`throw new NotSslRecordException("not an SSL/TLS record");`
`1203`	`1203`	`}`
`1204`	`1204`
	`1205`	`+ assert packetLength >= 0;`
	`1206`	`+`
`1205`	`1207`	`final int packetLengthDataOnly = packetLength - SSL_RECORD_HEADER_LENGTH;`
`1206`	`1208`	`if (packetLengthDataOnly > capacity) {`
`1207`	`1209`	`// Not enough space in the destination buffer so signal the caller that the buffer needs to be`