Skip to content

Reject negative choice values in SetType #1112

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

Open
raphaelroshan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reject negative choice values in SetType #1112

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/SetType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public Choice(final Node node, final PrimitiveType encodingType)
deprecated = Integer.parseInt(getAttributeValue(node, "deprecated", "0"));

// choice values are bit positions (0, 1, 2, 3, 4, etc.) from LSB to MSB
if (value.longValue() >= (encodingType.size() * 8L))
if (value.longValue() < 0 || value.longValue() >= (encodingType.size() * 8L))
{
throw new IllegalArgumentException("Choice value out of bounds: " + value.longValue());
}
Expand Down
15 changes: 15 additions & 0 deletions sbe-tool/src/test/java/uk/co/real_logic/sbe/xml/SetTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,21 @@ void shouldThrowExceptionWhenValueOutOfBoundsSpecified()
parseTestXmlWithMap("/types/set", testXmlString));
}

@Test
void shouldThrowExceptionWhenNegativeValueSpecified()
{
final String testXmlString =
"<types>" +
"<set name=\"biOp\" encodingType=\"uint8\">" +
" <choice name=\"Bit0\">0</choice>" +
" <choice name=\"BitNeg\">-1</choice>" +
"</set>" +
"</types>";

assertThrows(IllegalArgumentException.class, () ->
parseTestXmlWithMap("/types/set", testXmlString));
}

@Test
void shouldHandleEncodingTypesWithNamedTypes() throws Exception
{
Expand Down
Loading