Fix prevent nil pointer dereference

wirelessjeano · Feb 1, 2021 · b5b8139 · b5b8139
1 parent a644c83
commit b5b8139
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go
@@ -431,6 +431,7 @@ func (d *DownTrack) handleRTCP(bytes []byte) {
 		}
 	}
 	if d.trackType == SimulcastDownTrack && maxRatePacketLoss != 0 || expectedMinBitrate != 0 {
+		d.handleLayerChange(maxRatePacketLoss, expectedMinBitrate)
 	}
 
 	if len(fwdPkts) > 0 {

diff --git a/pkg/sfu/receiver.go b/pkg/sfu/receiver.go
@@ -220,7 +220,11 @@ func (w *WebRTCReceiver) RetransmitPackets(track *DownTrack, packets []packetMet
 	w.nackWorker.Submit(func() {
 		for _, meta := range packets {
 			pktBuff := packetFactory.Get().([]byte)
-			i, err := w.buffers[meta.getLayer()].GetPacket(pktBuff, meta.getSourceSeqNo())
+			buff := w.buffers[meta.getLayer()]
+			if buff == nil {
+				break
+			}
+			i, err := buff.GetPacket(pktBuff, meta.getSourceSeqNo())
 			if err != nil {
 				if err == io.EOF {
 					break
-Original file line number
+Diff line change
@@ Expand Up / @@ -431,6 +431,7 @@ func (d *DownTrack) handleRTCP(bytes []byte) { @@
     		}
     	}
     	if d.trackType == SimulcastDownTrack && maxRatePacketLoss != 0 || expectedMinBitrate != 0 {
+    		d.handleLayerChange(maxRatePacketLoss, expectedMinBitrate)
     	}
     	if len(fwdPkts) > 0 {
@@ Expand Down @@