Skip to content

fix: harden Room event handling against crashes and native leaks #179

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

Open
darshankparmar wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: harden Room event handling against crashes and native leaks #179

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bed01f0
fix: prevent crash when TrackSubscribed arrives before publication
darshankparmar Jan 5, 2026
c3f941b
fix: dispose unhandled stream readers to prevent native leaks
darshankparmar Jan 5, 2026
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
17 changes: 11 additions & 6 deletions Runtime/Scripts/Room.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,12 @@ internal void OnEventReceived(RoomEvent e)
var track = e.TrackSubscribed.Track;
var info = track.Info;
var participant = RemoteParticipants[e.TrackSubscribed.ParticipantIdentity];
var publication = participant.Tracks[info.Sid];

if (publication == null)
if (!participant.Tracks.TryGetValue(info.Sid, out var publication))
{
publication = new RemoteTrackPublication(info, FfiHandle.FromOwnedHandle(track.Handle));
participant._tracks.Add(publication.Sid, publication);
participant.OnTrackPublished(publication);
}

if (info.Kind == TrackKind.KindVideo)
Expand Down Expand Up @@ -466,13 +467,17 @@ internal void OnEventReceived(RoomEvent e)
break;
case RoomEvent.MessageOneofCase.ByteStreamOpened:
var byteReader = new ByteStreamReader(e.ByteStreamOpened.Reader);
_streamHandlers.Dispatch(byteReader, e.ByteStreamOpened.ParticipantIdentity);
// TODO: Immediately dispose unhandled stream reader
if (!_streamHandlers.Dispatch(byteReader, e.ByteStreamOpened.ParticipantIdentity))
{
byteReader.Dispose();
}
break;
case RoomEvent.MessageOneofCase.TextStreamOpened:
var textReader = new TextStreamReader(e.TextStreamOpened.Reader);
_streamHandlers.Dispatch(textReader, e.TextStreamOpened.ParticipantIdentity);
// TODO: Immediately dispose unhandled stream reader
if (!_streamHandlers.Dispatch(textReader, e.TextStreamOpened.ParticipantIdentity))
{
textReader.Dispose();
}
break;
case RoomEvent.MessageOneofCase.ConnectionStateChanged:
ConnectionState = e.ConnectionStateChanged.State;
Expand Down
Loading