From e5e9ece0989d3aa01fe19aff6cb0870d74d0203d Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 30 Aug 2020 21:39:29 +0100 Subject: [PATCH] Fix JS5 uncompression of large GZIP-compressed files Signed-off-by: Graham --- .../java/dev/openrs2/cache/Js5Compression.kt | 10 +++++++++- .../dev/openrs2/cache/Js5CompressionTest.kt | 11 +++++++++++ .../openrs2/cache/compression/gzip-large.dat | Bin 0 -> 12349 bytes .../dev/openrs2/cache/compression/large.dat | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 cache/src/test/resources/dev/openrs2/cache/compression/gzip-large.dat create mode 100644 cache/src/test/resources/dev/openrs2/cache/compression/large.dat diff --git a/cache/src/main/java/dev/openrs2/cache/Js5Compression.kt b/cache/src/main/java/dev/openrs2/cache/Js5Compression.kt index 8cc8fa4f08..d110b4e245 100644 --- a/cache/src/main/java/dev/openrs2/cache/Js5Compression.kt +++ b/cache/src/main/java/dev/openrs2/cache/Js5Compression.kt @@ -7,6 +7,7 @@ import dev.openrs2.crypto.xteaEncrypt import io.netty.buffer.ByteBuf import io.netty.buffer.ByteBufInputStream import io.netty.buffer.ByteBufOutputStream +import java.io.EOFException public object Js5Compression { public fun compress(input: ByteBuf, type: Js5CompressionType, key: XteaKey = XteaKey.ZERO): ByteBuf { @@ -102,7 +103,14 @@ public object Js5Compression { plaintext.alloc().buffer(uncompressedLen, uncompressedLen).use { output -> type.createInputStream(ByteBufInputStream(plaintext, len), uncompressedLen).use { inputStream -> - output.writeBytes(inputStream, uncompressedLen) + var remaining = uncompressedLen + while (remaining > 0) { + val n = output.writeBytes(inputStream, remaining) + if (n == -1) { + throw EOFException() + } + remaining -= n + } } return output.retain() diff --git a/cache/src/test/java/dev/openrs2/cache/Js5CompressionTest.kt b/cache/src/test/java/dev/openrs2/cache/Js5CompressionTest.kt index 206ee8b3db..2151283d93 100644 --- a/cache/src/test/java/dev/openrs2/cache/Js5CompressionTest.kt +++ b/cache/src/test/java/dev/openrs2/cache/Js5CompressionTest.kt @@ -55,6 +55,17 @@ object Js5CompressionTest { } } + @Test + fun testUncompressLargeGzip() { + read("gzip-large.dat").use { input -> + Js5Compression.uncompress(input).use { actual -> + read("large.dat").use { expected -> + assertEquals(expected, actual) + } + } + } + } + @Test fun testCompressBzip2() { Unpooled.wrappedBuffer("OpenRS2".toByteArray()).use { expected -> diff --git a/cache/src/test/resources/dev/openrs2/cache/compression/gzip-large.dat b/cache/src/test/resources/dev/openrs2/cache/compression/gzip-large.dat new file mode 100644 index 0000000000000000000000000000000000000000..c6ec617a2c5acb00baf8f794be9849eacb9c7753 GIT binary patch literal 12349 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