rtmp: return error in case of extended chunk stream IDs (#2806)

1 year ago · 22414bb38c
12 changed files with 4 additions and 20 deletions
--- a/internal/protocols/rtmp/rawmessage/reader.go
+++ b/internal/protocols/rtmp/rawmessage/reader.go
@ -293,6 +293,10 @@ func (r *Reader) Read() (*Message, error) {
				@@ -293,6 +293,10 @@ func (r *Reader) Read() (*Message, error) {
 		typ := byt >> 6
 		chunkStreamID := byt & 0x3F

+		if chunkStreamID < 2 {
+			return nil, fmt.Errorf("extended chunk stream IDs are not supported (yet)")
+		}
+
 		rc, ok := r.chunkStreams[chunkStreamID]
 		if !ok {
 			rc = &readerChunkStream{mr: r}
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/2470f01dca6d27ef
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/2470f01dca6d27ef
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("\xe6")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/2c0aa0d43cf2378b
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/2c0aa0d43cf2378b
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("0000\xf4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/3225fb43d226570f
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/3225fb43d226570f
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("0000\x00\x00000000000000000000000000000000000000000000000000000000\xb0")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/582528ddfad69eb5
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/582528ddfad69eb5
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("0")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/649388b35b8d7d24
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/649388b35b8d7d24
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("\x00000\x00\x00\x04000000000\x800000000\xc0")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/899c4ec5c6184841
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/899c4ec5c6184841
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\xf0")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/a2d2a54b9b1b0098
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/a2d2a54b9b1b0098
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/ab461fd3f1e0b76d
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/ab461fd3f1e0b76d
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000p")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/cf0f70a31328c9ba
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/cf0f70a31328c9ba
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\xb0")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/f5aad145f6286289
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/f5aad145f6286289
@ -1,2 +0,0 @@
				@@ -1,2 +0,0 @@
-go test fuzz v1
-[]byte("\x80")
--- a/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/19981bffc2abbaf1
+++ b/internal/protocols/rtmp/rawmessage/testdata/fuzz/FuzzDecoder/19981bffc2abbaf1