fmp4: prevent RAM exhaustion by limiting max sample count

bluenviron · Aug 1, 2024 · f13baaf · f13baaf
1 parent b9a9ebf
commit f13baaf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/pkg/formats/fmp4/fmp4.go b/pkg/formats/fmp4/fmp4.go
@@ -1,2 +1,6 @@
 // Package fmp4 contains a fragmented-MP4 reader and writer.
 package fmp4
+
+const (
+	maxSamplesPerTrun = 120 * 160 // 120fps * 60 seconds
+)
diff --git a/pkg/formats/fmp4/parts.go b/pkg/formats/fmp4/parts.go
@@ -110,6 +110,15 @@ func (ps *Parts) Unmarshal(byts []byte) error {
 					return nil, fmt.Errorf("unexpected trun")
 				}
 
+				// prevent RAM exhaustion due to unlimited Trun unmarshaling
+				rawBox := byts[h.BoxInfo.Offset:]
+				if len(rawBox) >= 16 {
+					sampleCount := uint32(rawBox[12])<<24 | uint32(rawBox[13])<<16 | uint32(rawBox[14])<<8 | uint32(rawBox[15])
+					if sampleCount > maxSamplesPerTrun {
+						return nil, fmt.Errorf("sample count (%d) exceeds maximum (%d)", sampleCount, maxSamplesPerTrun)
+					}
+				}
+
 				box, _, err := h.ReadPayload()
 				if err != nil {
 					return nil, err

diff --git a/pkg/formats/fmp4/testdata/fuzz/FuzzPartsUnmarshal/971288027908400b b/pkg/formats/fmp4/testdata/fuzz/FuzzPartsUnmarshal/971288027908400b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x00\x00\x00\xc8moof\x00\x00\x00\x10mfhd\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00`traf\x00\x00\x00\x10tfhd\x00\x00\x00\x00\x00\x01_\x90\x00\x00\x004trun\x00\x01\x00\x00\xf9\xff\xff\x00")
diff --git a/pkg/formats/fmp4/testdata/fuzz/FuzzPartsUnmarshal/aa157382146cae53 b/pkg/formats/fmp4/testdata/fuzz/FuzzPartsUnmarshal/aa157382146cae53
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("0000moof\x00\x00\x00\x10mfhd\x00000000000 0traf\x00\x00\x00\x10tfhd\x0000\x00000000\x000trun")