From e0e720c1b78506f1f9c00e2d275caa170becc927 Mon Sep 17 00:00:00 2001 From: Joel Kronqvist Date: Sun, 17 Nov 2024 01:59:46 +0200 Subject: Bug fix: Server.Client.nextLine left newlines at starts of lines --- src/main/scala/Server/Client.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/scala/Server/Client.scala') diff --git a/src/main/scala/Server/Client.scala b/src/main/scala/Server/Client.scala index d4f1864..7c7a786 100644 --- a/src/main/scala/Server/Client.scala +++ b/src/main/scala/Server/Client.scala @@ -99,7 +99,12 @@ class Client(val socket: Socket): if this.incompleteMessage(nextCRLF + 1) != CRLF(1) then nextCRLF = -1 if nextCRLF != -1 then val message = this.incompleteMessage.take(nextCRLF) - val rest = this.incompleteMessage.drop(nextCRLF + 1) + val rest = this.incompleteMessage.drop(nextCRLF + 2) + assert(rest.headOption != Some(CRLF(1))) // I will compile this with + // assertions off... I'd + // like to know how to make + // tests work with this + // config... this.incompleteMessage = rest ++ Array.fill(nextCRLF + 1)(0.toByte) // TODO: the conversion may probably be exploited to crash the server Some(String(message)) -- cgit v1.2.3