apps/go2rtc
1
0
Fork 0
mirror of https://github.com/AlexxIT/go2rtc.git synced 2025-09-26 20:31:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible panic for tlv8.UnmarshalBase64

Browse Source
This commit is contained in:
Alex X
2025-03-12 06:05:21 +03:00
parent fa580c516e
commit 6a4c73db03
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/homekit/server.go
View File

@@ -87,7 +87,7 @@ func (s *server) SetCharacteristic(conn net.Conn, aid uint8, iid uint64, value a
switch char.Type {
case camera.TypeSetupEndpoints:
var offer camera.SetupEndpoints
if err := tlv8.UnmarshalBase64(value.(string), &offer); err != nil {
if err := tlv8.UnmarshalBase64(value, &offer); err != nil {
return
}
@@ -96,7 +96,7 @@ func (s *server) SetCharacteristic(conn net.Conn, aid uint8, iid uint64, value a
case camera.TypeSelectedStreamConfiguration:
var conf camera.SelectedStreamConfig
if err := tlv8.UnmarshalBase64(value.(string), &conf); err != nil {
if err := tlv8.UnmarshalBase64(value, &conf); err != nil {
return
}

5
pkg/hap/tlv8/tlv8.go
View File

@@ -142,12 +142,13 @@ func appendValue(b []byte, tag byte, value reflect.Value) ([]byte, error) {
return nil, errors.New("tlv8: not implemented: " + value.Kind().String())
}
func UnmarshalBase64(s string, v any) error {
func UnmarshalBase64(in any, out any) error {
s, _ := in.(string) // protect from in == nil
data, err := base64.StdEncoding.DecodeString(s)
if err != nil {
return err
}
return Unmarshal(data, v)
return Unmarshal(data, out)
}
func UnmarshalReader(r io.Reader, v any) error {