Skip to content

fix(SideloadedSubtitle): guard AVSubtitlesLoader state against concurrent mutation #127

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
Efka22 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(SideloadedSubtitle): guard AVSubtitlesLoader state against concurrent mutation #127

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

### Fixed

- SideloadedSubtitle
- Fixed a data race that could crash with `EXC_BAD_ACCESS` when playing a stream with side-loaded text tracks, caused by concurrent mutation of the internal request/subtitle collections from the playlist interception callbacks.

## [11.0.4] - 2026-05-29

### Changed
Expand Down
15 changes: 13 additions & 2 deletions ...deloaded-TextTracks/Sources/THEOplayerConnectorSideloadedSubtitle/AVSubtitlesLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,23 @@ class AVSubtitlesLoader: NSObject {
}

private let _subtitles: [TextTrackDescription]
private var subtitles: [TextTrackDescription] = []
private let transformer = SubtitlesTransformer()
private let synchronizer: SubtitlesSynchronizer?
private let _id: String
private var variantTotalDuration: Double = 0
private var requestMap: [URL: URLRequest] = [:]

private let subtitlesLock = NSLock()
private var subtitlesStorage: [TextTrackDescription] = []
private var subtitles: [TextTrackDescription] {
get { self.subtitlesLock.lock(); defer { self.subtitlesLock.unlock() }; return self.subtitlesStorage }
set { self.subtitlesLock.lock(); defer { self.subtitlesLock.unlock() }; self.subtitlesStorage = newValue }
}
private let requestMapLock = NSLock()
private var requestMapStorage: [URL: URLRequest] = [:]
private var requestMap: [URL: URLRequest] {
get { self.requestMapLock.lock(); defer { self.requestMapLock.unlock() }; return self.requestMapStorage }
set { self.requestMapLock.lock(); defer { self.requestMapLock.unlock() }; self.requestMapStorage = newValue }
}

init(subtitles: [TextTrackDescription], id: String, player: THEOplayer? = nil) {
self._subtitles = subtitles
Expand Down