From 4f7560fbeebe650252a06ab072159a585d7c7522 Mon Sep 17 00:00:00 2001 From: ShiBen <807629978@qq.com> Date: Mon, 26 Jul 2021 09:00:32 +0800 Subject: [PATCH 1/2] fix#102 --- pkg/rtmp/amf0.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/rtmp/amf0.go b/pkg/rtmp/amf0.go index 8823485..e06c435 100644 --- a/pkg/rtmp/amf0.go +++ b/pkg/rtmp/amf0.go @@ -304,6 +304,8 @@ func (amf0) ReadObject(b []byte) (ObjectPairArray, int, error) { } ops = append(ops, ObjectPair{k, v}) index += l + case Amf0TypeMarkerNull: + index += 1 default: nazalog.Panicf("unknown type. vt=%d", vt) } From ac70d57bac887df78a68cfa7658dd70bd5984654 Mon Sep 17 00:00:00 2001 From: ShiBen <807629978@qq.com> Date: Mon, 26 Jul 2021 09:00:32 +0800 Subject: [PATCH 2/2] fix#102 --- pkg/rtmp/amf0.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/rtmp/amf0.go b/pkg/rtmp/amf0.go index 8823485..a77b513 100644 --- a/pkg/rtmp/amf0.go +++ b/pkg/rtmp/amf0.go @@ -304,6 +304,12 @@ func (amf0) ReadObject(b []byte) (ObjectPairArray, int, error) { } ops = append(ops, ObjectPair{k, v}) index += l + case Amf0TypeMarkerNull: + l, err := Amf0.ReadNull(b[index:]) + if err != nil { + return nil, 0, err + } + index += l default: nazalog.Panicf("unknown type. vt=%d", vt) } @@ -357,6 +363,12 @@ func (amf0) ReadArray(b []byte) (ObjectPairArray, int, error) { } ops = append(ops, ObjectPair{k, v}) index += l + case Amf0TypeMarkerNull: + l, err := Amf0.ReadNull(b[index:]) + if err != nil { + return nil, 0, err + } + index += l default: nazalog.Panicf("unknown type. vt=%d", vt) }