forked from security/hakurei
internal/pipewire: check for trailing garbage
This is useful during development. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -172,6 +172,17 @@ type UnmarshalSetError struct{ Type reflect.Type }
|
|||||||
|
|
||||||
func (u *UnmarshalSetError) Error() string { return "cannot set: " + u.Type.String() }
|
func (u *UnmarshalSetError) Error() string { return "cannot set: " + u.Type.String() }
|
||||||
|
|
||||||
|
// A TrailingGarbageError describes extra bytes after decoding
|
||||||
|
// has completed during [Unmarshal].
|
||||||
|
type TrailingGarbageError struct{ Data []byte }
|
||||||
|
|
||||||
|
func (e *TrailingGarbageError) Error() string {
|
||||||
|
if len(e.Data) < 8 {
|
||||||
|
return "got " + strconv.Itoa(len(e.Data)) + " bytes of trailing garbage"
|
||||||
|
}
|
||||||
|
return "data has extra values starting with type " + strconv.Itoa(int(binary.NativeEndian.Uint32(e.Data[4:])))
|
||||||
|
}
|
||||||
|
|
||||||
// unmarshalValue implements [Unmarshal] on [reflect.Value].
|
// unmarshalValue implements [Unmarshal] on [reflect.Value].
|
||||||
func unmarshalValue(data []byte, v reflect.Value, sizeP *Word) error {
|
func unmarshalValue(data []byte, v reflect.Value, sizeP *Word) error {
|
||||||
switch v.Kind() {
|
switch v.Kind() {
|
||||||
@@ -201,6 +212,10 @@ func unmarshalValue(data []byte, v reflect.Value, sizeP *Word) error {
|
|||||||
// already bounds checked by the successful unmarshalValue call
|
// already bounds checked by the successful unmarshalValue call
|
||||||
data = data[8+fieldWireSize+paddingSize:]
|
data = data[8+fieldWireSize+paddingSize:]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(data) != 0 {
|
||||||
|
return &TrailingGarbageError{data}
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|
||||||
case reflect.Pointer:
|
case reflect.Pointer:
|
||||||
|
|||||||
Reference in New Issue
Block a user