diff --git a/.gitignore b/.gitignore index 02c31be8a8..8fd57d676e 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/gocode/flyweight/src/otf/otf_absent_var_data_test.go b/gocode/flyweight/src/otf/otf_absent_var_data_test.go new file mode 100644 index 0000000000..1dcdec8525 --- /dev/null +++ b/gocode/flyweight/src/otf/otf_absent_var_data_test.go @@ -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{}) + }) +} diff --git a/sbe-tool/src/main/golang/otf/otfmessagedecoder.go b/sbe-tool/src/main/golang/otf/otfmessagedecoder.go index 09e070e120..d53a267034 100644 --- a/sbe-tool/src/main/golang/otf/otfmessagedecoder.go +++ b/sbe-tool/src/main/golang/otf/otfmessagedecoder.go @@ -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)