TrueCloudLab
/
frostfs-api-go
22
0
Fork 12
Code Issues 8 Pull Requests 2 Actions Releases Activity

[#413] util/proto: Marshal repeated []byte fields correctly 

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
pull/1/head
Evgenii Stratonikov 2022-08-26 14:18:07 +03:00 committed by fyrchik
parent 98db3fa284
commit 9e17cdfc76
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/proto/marshal.go
View File

@ -24,7 +24,10 @@ func BytesMarshal(field int, buf, v []byte) int {
if len(v) == 0 { if len(v) == 0 {
return 0 return 0
} }
return bytesMarshal(field, buf, v)
}
func bytesMarshal(field int, buf, v []byte) int {
prefix := field<<3 | 0x2 prefix := field<<3 | 0x2
// buf length check can prevent panic at PutUvarint, but it will make // buf length check can prevent panic at PutUvarint, but it will make
@ -41,10 +44,13 @@ func BytesSize(field int, v []byte) int {
if ln == 0 { if ln == 0 {
return 0 return 0
} }
return bytesSize(field, v)
}
func bytesSize(field int, v []byte) int {
prefix := field<<3 | 0x2 prefix := field<<3 | 0x2
return VarUIntSize(uint64(prefix)) + VarUIntSize(uint64(ln)) + ln return VarUIntSize(uint64(prefix)) + VarUIntSize(uint64(len(v))) + len(v)
} }
func StringMarshal(field int, buf []byte, v string) int { func StringMarshal(field int, buf []byte, v string) int {
@ -141,7 +147,7 @@ func RepeatedBytesMarshal(field int, buf []byte, v [][]byte) int {
var offset int var offset int
for i := range v { for i := range v {
offset += BytesMarshal(field, buf[offset:], v[i]) offset += bytesMarshal(field, buf[offset:], v[i])
} }
return offset return offset
@ -149,7 +155,7 @@ func RepeatedBytesMarshal(field int, buf []byte, v [][]byte) int {
func RepeatedBytesSize(field int, v [][]byte) (size int) { func RepeatedBytesSize(field int, v [][]byte) (size int) {
for i := range v { for i := range v {
size += BytesSize(field, v[i]) size += bytesSize(field, v[i])
} }
return size return size
@ -159,7 +165,7 @@ func RepeatedStringMarshal(field int, buf []byte, v []string) int {
var offset int var offset int
for i := range v { for i := range v {
offset += StringMarshal(field, buf[offset:], v[i]) offset += bytesMarshal(field, buf[offset:], []byte(v[i]))
} }
return offset return offset
@ -167,7 +173,7 @@ func RepeatedStringMarshal(field int, buf []byte, v []string) int {
func RepeatedStringSize(field int, v []string) (size int) { func RepeatedStringSize(field int, v []string) (size int) {
for i := range v { for i := range v {
size += StringSize(field, v[i]) size += bytesSize(field, []byte(v[i]))
} }
return size return size

8
util/proto/marshal_test.go
View File

@ -313,6 +313,10 @@ func TestRepeatedBytesMarshal(t *testing.T) {
testRepeatedBytesMarshal(t, [][]byte{}, false) testRepeatedBytesMarshal(t, [][]byte{}, false)
}) })
t.Run("empty element", func(t *testing.T) {
testRepeatedBytesMarshal(t, [][]byte{{1}, {}}, false)
})
t.Run("nil", func(t *testing.T) { t.Run("nil", func(t *testing.T) {
testRepeatedBytesMarshal(t, nil, false) testRepeatedBytesMarshal(t, nil, false)
}) })
@ -325,6 +329,10 @@ func TestRepeatedStringMarshal(t *testing.T) {
testRepeatedStringMarshal(t, data, true) testRepeatedStringMarshal(t, data, true)
}) })
t.Run("empty element", func(t *testing.T) {
testRepeatedStringMarshal(t, []string{""}, false)
})
t.Run("empty", func(t *testing.T) { t.Run("empty", func(t *testing.T) {
testRepeatedStringMarshal(t, []string{}, false) testRepeatedStringMarshal(t, []string{}, false)
}) })