SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-03 11:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

varbin: Accept fixed slices

Browse source
This commit is contained in:
世界 2024-06-24 13:51:49 +08:00
parent e0196407a3
commit 4745c34b4c
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
common/varbin/data.go
View file

@ -121,28 +121,33 @@ func read(r Reader, order binary.ByteOrder, data reflect.Value) error {
}
}
case reflect.Slice:
sliceLength, err := binary.ReadUvarint(r)
if err != nil {
return E.Cause(err, "slice length")
var itemLength int
if !data.IsNil() {
itemLength = data.Len()
}
if sliceLength == 0 {
data.SetZero()
} else {
dataSlices := makeBaseDataSlices(data, int(sliceLength))
if itemLength == 0 {
slicesLength, err := binary.ReadUvarint(r)
if err != nil {
return E.Cause(err, "slice length")
}
itemLength = int(slicesLength)
}
if itemLength > 0 {
dataSlices := makeBaseDataSlices(data, int(itemLength))
if dataSlices != nil {
err = binary.Read(r, order, dataSlices)
err := binary.Read(r, order, dataSlices)
if err != nil {
return err
}
setBaseDataSlices(data, dataSlices)
} else {
if !data.IsNil() && data.Cap() >= int(sliceLength) {
data.SetLen(int(sliceLength))
} else if sliceLength > 0 {
data.Set(reflect.MakeSlice(data.Type(), int(sliceLength), int(sliceLength)))
if !data.IsNil() && data.Len() != itemLength && data.Cap() >= itemLength {
data.SetLen(itemLength)
} else {
data.Set(reflect.MakeSlice(data.Type(), itemLength, itemLength))
}
for i := 0; i < int(sliceLength); i++ {
err = read(r, order, data.Index(i))
for i := 0; i < itemLength; i++ {
err := read(r, order, data.Index(i))
if err != nil {
return E.Cause(err, "[", i, "]")
}