dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-08-03 02:29:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix getRefLayerRTPTimestamp off-by-one that can panic on max layer index (#4712)

Browse Source 
* Fix getRefLayerRTPTimestamp off-by-one that can panic on max layer index.

Reject ref/target layers with >= len(refInfos) so layer==len is an error instead of an out-of-range index.

* Remove historical comment from ref-layer bounds test.

Keep the regression coverage without referencing the old bounds check in source.
This commit is contained in:
Felix-Ayush
2026-07-30 15:24:50 +05:30
committed by GitHub
parent 436a0cc3d3
commit 0759280cd0
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sfu/forwarder.go
+1 -1
View File
@@ -1792,7 +1792,7 @@ func (f *Forwarder) GetTranslationParams(extPkt *buffer.ExtPacket, layer int32)
}
func (f *Forwarder) getRefLayerRTPTimestamp(ts uint32, refLayer, targetLayer int32) (uint32, error) {
if refLayer < 0 || int(refLayer) > len(f.refInfos) || targetLayer < 0 || int(targetLayer) > len(f.refInfos) {
if refLayer < 0 || int(refLayer) >= len(f.refInfos) || targetLayer < 0 || int(targetLayer) >= len(f.refInfos) {
return 0, fmt.Errorf("invalid layer(s), refLayer: %d, targetLayer: %d", refLayer, targetLayer)
}
pkg/sfu/forwarder_test.go
+28
View File
@@ -2187,3 +2187,31 @@ func TestForwarderInitialAcquisitionGrace(t *testing.T) {
require.Equal(t, int32(1), alloc.TargetLayer.Spatial)
require.Equal(t, int32(1), alloc.RequestLayerSpatial)
}
func TestGetRefLayerRTPTimestampBounds(t *testing.T) {
f := newForwarder(testutils.TestVP8Codec, webrtc.RTPCodecTypeVideo)
layerCount := int32(len(f.refInfos))
_, err := f.getRefLayerRTPTimestamp(1000, layerCount, 0)
require.Error(t, err)
_, err = f.getRefLayerRTPTimestamp(1000, 0, layerCount)
require.Error(t, err)
_, err = f.getRefLayerRTPTimestamp(1000, -1, 0)
require.Error(t, err)
_, err = f.getRefLayerRTPTimestamp(1000, 0, -1)
require.Error(t, err)
// same-layer translation does not need sender reports
ts, err := f.getRefLayerRTPTimestamp(1000, 0, 0)
require.NoError(t, err)
require.Equal(t, uint32(1000), ts)
// last valid index must be accepted by the bounds check (may still error for missing SR)
_, err = f.getRefLayerRTPTimestamp(1000, layerCount-1, 0)
require.Error(t, err) // unavailable sender report, not invalid layer
require.Contains(t, err.Error(), "unavailable")
}