Skip to content

core (fix): Fix MessageUnpacker.unpackValue to check the custom stringSizeLimit #753

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 2 commits into from
Jul 31, 2023
Merged

core (fix): Fix MessageUnpacker.unpackValue to check the custom stringSizeLimit #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59c68e1
core (fix): Fix MessageUnpacker.unpackValue to check the custom strin…
xerial Jul 31, 2023
54b8f80
Cover unpackVariable(var)
xerial Jul 31, 2023
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
6 changes: 6 additions & 0 deletions msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,9 @@ public ImmutableValue unpackValue()
return ValueFactory.newFloat(unpackDouble());
case STRING: {
int length = unpackRawStringHeader();
if (length > stringSizeLimit) {
throw new MessageSizeException(String.format("cannot unpack a String of size larger than %,d: %,d", stringSizeLimit, length), length);
}
return ValueFactory.newString(readPayload(length), true);
}
case BINARY: {
Expand Down Expand Up @@ -689,6 +692,9 @@ public Variable unpackValue(Variable var)
return var;
case STRING: {
int length = unpackRawStringHeader();
if (length > stringSizeLimit) {
throw new MessageSizeException(String.format("cannot unpack a String of size larger than %,d: %,d", stringSizeLimit, length), length);
}
var.setStringValue(readPayload(length));
return var;
}
Expand Down
37 changes: 37 additions & 0 deletions msgpack-core/src/test/scala/org/msgpack/core/StringLimitTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package org.msgpack.core

import org.msgpack.core.MessagePack.UnpackerConfig
import org.msgpack.value.Variable
import wvlet.airspec.AirSpec

class StringLimitTest extends AirSpec {

test("throws an exception when the string size exceeds a limit") {
val customLimit = 100
val packer = MessagePack.newDefaultBufferPacker()
packer.packString("a" * (customLimit + 1))
val msgpack = packer.toByteArray

test("unpackString") {
val unpacker = new UnpackerConfig().withStringSizeLimit(customLimit).newUnpacker(msgpack)
intercept[MessageSizeException] {
unpacker.unpackString()
}
}

test("unpackValue") {
val unpacker = new UnpackerConfig().withStringSizeLimit(customLimit).newUnpacker(msgpack)
intercept[MessageSizeException] {
unpacker.unpackValue()
}
}

test("unpackValue(var)") {
val unpacker = new UnpackerConfig().withStringSizeLimit(customLimit).newUnpacker(msgpack)
intercept[MessageSizeException] {
val v = new Variable()
unpacker.unpackValue(v)
}
}
}
}