fix: guard against TOCTOU race on syncAudioPlayer from WebSocket thread#60
Merged
fix: guard against TOCTOU race on syncAudioPlayer from WebSocket thread#60
Conversation
In onAudioChunk, capture syncAudioPlayer into a local val before use to prevent the main thread from nulling/releasing it between the null check and the method call. Add isReleased guards to SyncAudioPlayer.queueChunk() and enterDraining() so that calls on a released player are safely ignored, even when a stale reference is held by another thread.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
onAudioChunk(WebSocket thread), capturesyncAudioPlayerinto a local val before decoding and queuing, preventing the main thread from nulling/releasing it mid-callisReleasedearly-return guard toSyncAudioPlayer.queueChunk()so calls on a released player are safely ignoredisReleasedearly-return guard toSyncAudioPlayer.enterDraining()for the same reason (called fromonReconnectingon the WebSocket thread)Test plan
assembleDebugpasses)IllegalStateExceptionfrom AudioTrack after player release