KTOR-5252 Fix Missing EOF exception

ktorio · Dec 5, 2022 · 588d711 · 588d711
1 parent 9e12c15
commit 588d711
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/ktor-io/jvm/src/io/ktor/utils/io/ByteBufferChannel.kt b/ktor-io/jvm/src/io/ktor/utils/io/ByteBufferChannel.kt
@@ -1655,7 +1655,7 @@ internal open class ByteBufferChannel(
 
         if (!read) {
             if (isClosedForRead) {
-                return
+                throw EOFException("Got EOF but at least $min bytes were expected")
             }
 
             readBlockSuspend(min, consumer)

diff --git a/ktor-io/jvm/test/io/ktor/utils/io/ByteBufferChannelTest.kt b/ktor-io/jvm/test/io/ktor/utils/io/ByteBufferChannelTest.kt
@@ -4,6 +4,8 @@
 
 package io.ktor.utils.io
 
+import io.ktor.test.dispatcher.*
+import io.ktor.utils.io.core.EOFException
 import kotlinx.coroutines.*
 import kotlinx.coroutines.debug.junit4.*
 import org.junit.*
@@ -24,6 +26,29 @@ class ByteBufferChannelTest {
         assertFailsWith<IOException> { runBlocking { channel.readByte() } }
     }
 
+    @Test
+    fun testEarlyEOF() = testSuspend {
+        repeat(20000) {
+            val channel = ByteChannel(true)
+            launch(Dispatchers.IO) {
+                channel.writeFully("1\n".toByteArray())
+                channel.close()
+            }
+
+            launch(Dispatchers.IO) {
+                channel.read(1) {
+                    it.get(ByteArray(it.remaining()))
+                }
+
+                assertFailsWith<EOFException> {
+                    channel.read(1) {
+                        it.get(ByteArray(it.remaining()))
+                    }
+                }
+            }.join()
+        }
+    }
+
     @Test
     fun readRemainingThrowsOnClosed() = runBlocking {
         val channel = ByteBufferChannel(false)