Skip to content

Fix Scala code formatting #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xerial merged 1 commit into from
Jan 2, 2026
Merged

Fix Scala code formatting #939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions msgpack-core/src/test/scala/org/msgpack/core/PayloadSizeLimitTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ class PayloadSizeLimitTest extends AirSpec:
// 4 bytes = declared length (100MB, which exceeds 64MB threshold)
// 1 byte = extension type
// followed by only 1 byte of actual data (not 100MB)
val declaredLength = 100 * 1024 * 1024 // 100 MB
val buffer = ByteBuffer.allocate(7) // header(1) + length(4) + type(1) + data(1)
buffer.put(0xC9.toByte) // EXT32 format code
buffer.putInt(declaredLength) // declared length (big-endian)
buffer.put(0x01.toByte) // extension type
buffer.put(0x41.toByte) // only 1 byte of actual data
val maliciousData = buffer.array()
val declaredLength = 100 * 1024 * 1024 // 100 MB
val buffer = ByteBuffer.allocate(7) // header(1) + length(4) + type(1) + data(1)
buffer.put(0xc9.toByte) // EXT32 format code
buffer.putInt(declaredLength) // declared length (big-endian)
buffer.put(0x01.toByte) // extension type
buffer.put(0x41.toByte) // only 1 byte of actual data
val maliciousData = buffer.array()

val unpacker = MessagePack.newDefaultUnpacker(maliciousData)

Expand All @@ -33,12 +33,12 @@ class PayloadSizeLimitTest extends AirSpec:
// 0xC6 = BIN32 format
// 4 bytes = declared length (100MB, which exceeds 64MB threshold)
// followed by only 1 byte of actual data (not 100MB)
val declaredLength = 100 * 1024 * 1024 // 100 MB
val buffer = ByteBuffer.allocate(6) // header(1) + length(4) + data(1)
buffer.put(0xC6.toByte) // BIN32 format code
buffer.putInt(declaredLength) // declared length (big-endian)
buffer.put(0x41.toByte) // only 1 byte of actual data
val maliciousData = buffer.array()
val declaredLength = 100 * 1024 * 1024 // 100 MB
val buffer = ByteBuffer.allocate(6) // header(1) + length(4) + data(1)
buffer.put(0xc6.toByte) // BIN32 format code
buffer.putInt(declaredLength) // declared length (big-endian)
buffer.put(0x41.toByte) // only 1 byte of actual data
val maliciousData = buffer.array()

val unpacker = MessagePack.newDefaultUnpacker(maliciousData)

Expand All @@ -49,41 +49,41 @@ class PayloadSizeLimitTest extends AirSpec:
}

test("legitimate extension data works correctly") {
val packer = MessagePack.newDefaultBufferPacker()
val packer = MessagePack.newDefaultBufferPacker()
val testData = Array.fill[Byte](1000)(0x42)
packer.packExtensionTypeHeader(0x01.toByte, testData.length)
packer.writePayload(testData)
val msgpack = packer.toByteArray

val unpacker = MessagePack.newDefaultUnpacker(msgpack)
val value = unpacker.unpackValue()
val value = unpacker.unpackValue()

assert(value.isExtensionValue)
assert(value.asExtensionValue().getData.length == 1000)
}

test("legitimate binary data works correctly") {
val packer = MessagePack.newDefaultBufferPacker()
val packer = MessagePack.newDefaultBufferPacker()
val testData = Array.fill[Byte](1000)(0x42)
packer.packBinaryHeader(testData.length)
packer.writePayload(testData)
val msgpack = packer.toByteArray

val unpacker = MessagePack.newDefaultUnpacker(msgpack)
val value = unpacker.unpackValue()
val value = unpacker.unpackValue()

assert(value.isBinaryValue)
assert(value.asBinaryValue().asByteArray().length == 1000)
}

test("readPayload directly with malicious size throws exception") {
// Test readPayload(int) directly with a malicious input
val declaredLength = 100 * 1024 * 1024 // 100 MB
val buffer = ByteBuffer.allocate(6) // header(1) + length(4) + data(1)
buffer.put(0xC6.toByte) // BIN32 format code
buffer.putInt(declaredLength) // declared length (big-endian)
buffer.put(0x41.toByte) // only 1 byte of actual data
val maliciousData = buffer.array()
val declaredLength = 100 * 1024 * 1024 // 100 MB
val buffer = ByteBuffer.allocate(6) // header(1) + length(4) + data(1)
buffer.put(0xc6.toByte) // BIN32 format code
buffer.putInt(declaredLength) // declared length (big-endian)
buffer.put(0x41.toByte) // only 1 byte of actual data
val maliciousData = buffer.array()

val unpacker = MessagePack.newDefaultUnpacker(maliciousData)

Expand All @@ -99,15 +99,15 @@ class PayloadSizeLimitTest extends AirSpec:

test("small payloads under threshold work with upfront allocation") {
// Payloads under 64MB should use the efficient upfront allocation path
val packer = MessagePack.newDefaultBufferPacker()
val testData = Array.fill[Byte](10000)(0x42) // 10KB, well under threshold
val packer = MessagePack.newDefaultBufferPacker()
val testData = Array.fill[Byte](10000)(0x42) // 10KB, well under threshold
packer.packBinaryHeader(testData.length)
packer.writePayload(testData)
val msgpack = packer.toByteArray

val unpacker = MessagePack.newDefaultUnpacker(msgpack)
val len = unpacker.unpackBinaryHeader()
val payload = unpacker.readPayload(len)
val len = unpacker.unpackBinaryHeader()
val payload = unpacker.readPayload(len)

assert(payload.length == 10000)
assert(payload.forall(_ == 0x42.toByte))
Expand Down
Loading