Merge pull request #3624 from augi/patch-1

mpilquist · web-flow · commit edf0c4f2e660 · 2025-10-02T15:23:19.000-04:00
fix: GHSA-rrw2-px9j-qffj remediation backported to 2.5.x
diff --git a/io/src/main/scala/fs2/io/tls/TLSEngine.scala b/io/src/main/scala/fs2/io/tls/TLSEngine.scala
@@ -218,10 +218,7 @@ private[tls] object TLSEngine {
               else
                 binding.read(engine.getSession.getPacketBufferSize, timeout).flatMap {
                   case Some(c) => unwrapBuffer.input(c) >> unwrapHandshake(timeout)
-                  case None =>
-                    unwrapBuffer.inputRemains.flatMap(x =>
-                      if (x > 0) Applicative[F].unit else stopUnwrap
-                    )
+                  case None => stopUnwrap
                 }
             }
           case SSLEngineResult.HandshakeStatus.NEED_UNWRAP_AGAIN =>

Original file line number	Diff line number	Diff line change
`@@ -218,10 +218,7 @@ private[tls] object TLSEngine {`
`218`	`218`	`else`
`219`	`219`	`binding.read(engine.getSession.getPacketBufferSize, timeout).flatMap {`
`220`	`220`	`case Some(c) => unwrapBuffer.input(c) >> unwrapHandshake(timeout)`
`221`		`- case None =>`
`222`		`- unwrapBuffer.inputRemains.flatMap(x =>`
`223`		`- if (x > 0) Applicative[F].unit else stopUnwrap`
`224`		`- )`
	`221`	`+ case None => stopUnwrap`
`225`	`222`	`}`
`226`	`223`	`}`
`227`	`224`	`case SSLEngineResult.HandshakeStatus.NEED_UNWRAP_AGAIN =>`