Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ gocode/flyweight/src/*/*.go
!gocode/flyweight/src/*/*_test.go
gocode/flyweight/src/*/*/*.go
!gocode/flyweight/src/*/*/*_test.go
gocode/flyweight/src/otf/code-generation-schema.sbeir
gocode/flyweight/src/otf/*.sbeir

# csharp
csharp/*/bin
Expand Down
44 changes: 44 additions & 0 deletions gocode/flyweight/src/otf/otf_absent_var_data_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package otf

import (
"encoding/binary"
"github.com/real-logic/simple-binary-encoding/otf"
"github.com/stretchr/testify/assert"
"testing"
)

//go:generate java --add-opens java.base/jdk.internal.misc=ALL-UNNAMED -Dsbe.output.dir=. -Dsbe.generate.stubs=false -Dsbe.generate.ir=true -jar ../../../${SBE_JAR} ../../../../sbe-tool/src/test/resources/field-order-check-schema.xml

const FieldOrderCheckSchemaFilename = "field-order-check-schema.sbeir"

// AddVarDataV1 gained its var data field b in version 1, so a version 0 message ends after field a.
func TestDecodesOlderVersionMessageEndingBeforeAbsentVarData(t *testing.T) {
assert := assert.New(t)

ir := otf.NewIrDecoder()
assert.GreaterOrEqual(ir.DecodeFile(FieldOrderCheckSchemaFilename), 0)
tokens := ir.MessageByID(1019)
assert.NotEmpty(tokens)

buffer := make([]byte, 4)
binary.LittleEndian.PutUint32(buffer, 42)

listener := &TestListener{}
assert.NotPanics(func() {
assert.Equal(4, otf.Decode(buffer, 0, 4, tokens, listener))
})
assert.Contains(listener.out.String(), "AddVarDataV1.a=42")
}

func TestRejectsMissingLengthOfPresentVarData(t *testing.T) {
assert := assert.New(t)

ir := otf.NewIrDecoder()
assert.GreaterOrEqual(ir.DecodeFile(FieldOrderCheckSchemaFilename), 0)
tokens := ir.MessageByID(1019)

buffer := make([]byte, 4)
assert.PanicsWithValue("length too short for data length field", func() {
otf.Decode(buffer, 1, 4, tokens, &TestListener{})
})
}
3 changes: 2 additions & 1 deletion sbe-tool/src/main/golang/otf/otfmessagedecoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ func DecodeData(
isPresent := token.TokenVersion() <= int32(actingVersion)
lengthToken := tokens[tokenIndex+2]
dataToken := tokens[tokenIndex+3]
if (uint64(bufferIndex) + uint64(dataToken.Offset())) > length {
// Var data newer than the acting version has no length prefix on the wire.
if isPresent && (uint64(bufferIndex)+uint64(dataToken.Offset())) > length {
panic("length too short for data length field")
}
dataLength := uint64(0)
Expand Down
Loading