Merge pull request #1 from yschimke/fix/inflator_failure

Fix/inflator failure
square · Nov 26, 2024 · 3b56b8a · 3b56b8a
2 parents 29be44f + d611e49
commit 3b56b8a
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 25 deletions.
diff --git a/okhttp/src/main/kotlin/okhttp3/internal/ws/MessageInflater.kt b/okhttp/src/main/kotlin/okhttp3/internal/ws/MessageInflater.kt
@@ -55,6 +55,11 @@ class MessageInflater(
     do {
       inflaterSource.readOrInflate(buffer, Long.MAX_VALUE)
     } while (inflater.bytesRead < totalBytesToRead && !inflater.finished())
+
+    if (noContextTakeover && inflater.bytesRead < totalBytesToRead) {
+      val left = totalBytesToRead - inflater.bytesRead
+      throw IOException("additional bytes ($left) after inflation")
+    }
   }
 
   @Throws(IOException::class)

diff --git a/okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt b/okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt
diff --git a/okhttp/src/test/resources/okhttp3/internal/ws/inflater_notworking.txt b/okhttp/src/test/resources/okhttp3/internal/ws/inflater_notworking.txt
diff --git a/okhttp/src/test/resources/okhttp3/internal/ws/inflater_working.txt b/okhttp/src/test/resources/okhttp3/internal/ws/inflater_working.txt