security/hakurei
security/hakurei
6
3
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

internal/pipewire: wrap EOF error for deserialisation
All checks were successful
Test / Create distribution (push) Successful in 36s
Details
Test / Sandbox (push) Successful in 2m41s
Details
Test / Sandbox (race detector) (push) Successful in 4m37s
Details
Test / Hpkg (push) Successful in 4m58s
Details
Test / Hakurei (push) Successful in 5m5s
Details
Test / Hakurei (race detector) (push) Successful in 6m26s
Details
Test / Flake checks (push) Successful in 1m34s
Details

Browse Source 
The io.ErrUnexpectedEOF error can be returned from multiple places. This change eases error handling.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-12-02 03:19:37 +09:00
parent 647aa9d02f
commit 7bc73afadd
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/pipewire/pod.go
View File

@ -260,6 +260,12 @@ func (e *InvalidUnmarshalError) Error() string {
return "attempting to unmarshal to nil " + e.Type.String() return "attempting to unmarshal to nil " + e.Type.String()
} }
// UnexpectedEOFError is returned when EOF was encountered in the middle of decoding POD data.
type UnexpectedEOFError struct{}
func (UnexpectedEOFError) Unwrap() error { return io.ErrUnexpectedEOF }
func (UnexpectedEOFError) Error() string { return "unexpected EOF decoding POD data" }
// Unmarshal parses the PipeWire POD encoded data and stores the result // Unmarshal parses the PipeWire POD encoded data and stores the result
// in the value pointed to by v. If v is nil or not a pointer, // in the value pointed to by v. If v is nil or not a pointer,
// Unmarshal returns an [InvalidUnmarshalError]. // Unmarshal returns an [InvalidUnmarshalError].
@ -386,7 +392,7 @@ func unmarshalValue(data []byte, v reflect.Value, wireSizeP *Word) error {
case reflect.Pointer: case reflect.Pointer:
if len(data) < SizePrefix { if len(data) < SizePrefix {
return io.ErrUnexpectedEOF return UnexpectedEOFError{}
} }
switch binary.NativeEndian.Uint32(data[SizeSPrefix:]) { switch binary.NativeEndian.Uint32(data[SizeSPrefix:]) {
case SPA_TYPE_None: case SPA_TYPE_None:
@ -407,7 +413,7 @@ func unmarshalValue(data []byte, v reflect.Value, wireSizeP *Word) error {
// string size, one extra NUL byte // string size, one extra NUL byte
size := int(*wireSizeP) size := int(*wireSizeP)
if len(data) < size { if len(data) < size {
return io.ErrUnexpectedEOF return UnexpectedEOFError{}
} }
// the serialised strings still include NUL termination // the serialised strings still include NUL termination
@ -443,7 +449,7 @@ func (u *UnexpectedTypeError) Error() string {
// An expected size of zero skips further bounds checks. // An expected size of zero skips further bounds checks.
func unmarshalCheckTypeBounds(data *[]byte, t Word, sizeP *Word) error { func unmarshalCheckTypeBounds(data *[]byte, t Word, sizeP *Word) error {
if len(*data) < SizePrefix { if len(*data) < SizePrefix {
return io.ErrUnexpectedEOF return UnexpectedEOFError{}
} }
wantSize := *sizeP wantSize := *sizeP
@ -454,7 +460,7 @@ func unmarshalCheckTypeBounds(data *[]byte, t Word, sizeP *Word) error {
return &InconsistentSizeError{gotSize, wantSize} return &InconsistentSizeError{gotSize, wantSize}
} }
if len(*data)-SizePrefix < int(gotSize) { if len(*data)-SizePrefix < int(gotSize) {
return io.ErrUnexpectedEOF return UnexpectedEOFError{}
} }
gotType := binary.NativeEndian.Uint32((*data)[SizeSPrefix:]) gotType := binary.NativeEndian.Uint32((*data)[SizeSPrefix:])