Skip to content

Fix potential NPE when outbound fails to connect to a room. #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2025
Merged

Fix potential NPE when outbound fails to connect to a room. #525

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pkg/sip/outbound.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,10 @@ func (c *outboundCall) close(err error, status CallStatus, description string, r
info.DisconnectReason = reason
})
c.media.Close()
_ = c.lkRoom.CloseOutput()

_ = c.lkRoom.CloseWithReason(status.DisconnectReason())
if r := c.lkRoom; r != nil {
_ = r.CloseOutput()
_ = r.CloseWithReason(status.DisconnectReason())
}
c.lkRoomIn = nil

c.stopSIP(description)
Expand Down Expand Up @@ -390,6 +391,7 @@ func (c *outboundCall) connectToRoom(ctx context.Context, lkNew RoomConfig, getR
lkNew.Participant.Attributes = attrs
r := getRoom(c.log, &c.stats.Room)
if err := r.Connect(c.c.conf, lkNew); err != nil {
_ = r.Close()
return err
}
// We have to create the track early because we might play a dialtone while SIP connects.
Expand Down Expand Up @@ -492,6 +494,9 @@ func (c *outboundCall) setStatus(v CallStatus) {
if attr == "" {
return
}
if c.lkRoom == nil {
return
}
r := c.lkRoom.Room()
if r == nil {
return
Expand Down Expand Up @@ -617,6 +622,9 @@ func (c *outboundCall) sipSignal(ctx context.Context, tid traceid.ID) error {
}

func (c *outboundCall) handleDTMF(ev dtmf.Event) {
if c.lkRoom == nil {
return
}
_ = c.lkRoom.SendData(&livekit.SipDTMF{
Code: uint32(ev.Code),
Digit: string([]byte{ev.Digit}),
Expand Down
Loading