Refactoring

ord/string.go

@@ -63,6 +63,11 @@ func UnmarshalValidString(lenU mus.Unmarshaller[int],
 		err = com.ErrNegativeLength
 		return
 	}
+	l := n + length
+	if len(bs) < l {
+		err = mus.ErrTooSmallByteSlice
+		return
+	}
 	if lenVl != nil {
 		if err = lenVl.Validate(length); err != nil {
 			if skip {
@@ -74,11 +79,6 @@ func UnmarshalValidString(lenU mus.Unmarshaller[int],
 	if length == 0 {
 		return
 	}
-	l := n + length
-	if len(bs) < l {
-		err = mus.ErrTooSmallByteSlice
-		return
-	}
 	return string(bs[n:l]), l, nil
 }
 

unsafe/byte_slice.go

@@ -84,13 +84,7 @@ func UnmarshalValidByteSlice(lenU mus.Unmarshaller[int],
 // The lenS argument specifies the Sizer for the length of the slice, if nil,
 // varint.SizePositiveInt() is used.
 func SizeByteSlice(v []byte, lenS mus.Sizer[int]) (size int) {
-	length := len(v)
-	if lenS == nil {
-		size = varint.SizePositiveInt(length)
-	} else {
-		size = lenS.Size(length)
-	}
-	return size + length
+	return ord.SizeByteSlice(v, lenS)
 }
 
 // SkipByteSlice skips an encoded slice value.
@@ -101,19 +95,5 @@ func SizeByteSlice(v []byte, lenS mus.Sizer[int]) (size int) {
 // In addition to the number of skipped bytes, it may also return
 // mus.ErrTooSmallByteSlice, com.ErrOverflow or com.ErrNegativeLength.
 func SkipByteSlice(lenU mus.Unmarshaller[int], bs []byte) (n int, err error) {
-	var length int
-	if lenU == nil {
-		length, n, err = varint.UnmarshalPositiveInt(bs)
-	} else {
-		length, n, err = lenU.Unmarshal(bs)
-	}
-	if err != nil {
-		return
-	}
-	if length < 0 {
-		err = com.ErrNegativeLength
-		return
-	}
-	n += length
-	return
+	return ord.SkipByteSlice(lenU, bs)
 }

unsafe/string.go

@@ -64,6 +64,11 @@ func UnmarshalValidString(lenU mus.Unmarshaller[int], lenVl com.Validator[int],
 		err = com.ErrNegativeLength
 		return
 	}
+	l := n + length
+	if len(bs) < l {
+		err = mus.ErrTooSmallByteSlice
+		return
+	}
 	if lenVl != nil {
 		if err = lenVl.Validate(length); err != nil {
 			if skip {
@@ -75,11 +80,6 @@ func UnmarshalValidString(lenU mus.Unmarshaller[int], lenVl com.Validator[int],
 	if length == 0 {
 		return
 	}
-	l := n + length
-	if len(bs) < l {
-		err = mus.ErrTooSmallByteSlice
-		return
-	}
 	return unsafe_mod.String(&bs[n], length), l, nil
 }