Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-11-20 00:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix array index out of bounds crash in audio track handling

Browse Source 
This commit addresses crashes caused by race conditions when accessing audio track arrays:

- MPVBackend.swift: Use safe index clamping to prevent array out of bounds crashes when selecting audio tracks
- PlayerModel.swift: Add selectedAudioTrack computed property for thread-safe audio track access
- ControlsOverlay.swift: Use safe accessor with "Original" fallback label
- PlaybackSettings.swift: Use safe accessor with "Original" fallback label

This fix resolves approximately 37% of crashes (23 out of 62 crash logs) that were caused by index out of range errors in MPVBackend.playStream at line 345.
This commit is contained in:
Arkadiusz Fal
2025-11-19 18:01:02 +01:00
parent e882d0264b
commit 4b577a296b
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Model/Player/Backends/MPVBackend.swift
View File

@@ -338,11 +338,11 @@ final class MPVBackend: PlayerBackend {
// Handle streams with multiple audio tracks
if !stream.audioTracks.isEmpty {
if stream.selectedAudioTrackIndex >= stream.audioTracks.count {
stream.selectedAudioTrackIndex = 0
}
// Ensure the index is within bounds to prevent race conditions
let safeIndex = min(max(0, stream.selectedAudioTrackIndex), stream.audioTracks.count - 1)
stream.selectedAudioTrackIndex = safeIndex
stream.audioAsset = AVURLAsset(url: stream.audioTracks[stream.selectedAudioTrackIndex].url)
stream.audioAsset = AVURLAsset(url: stream.audioTracks[safeIndex].url)
let fileToLoad = self.model.musicMode ? stream.audioAsset.url : stream.videoAsset.url
let audioTrack = self.model.musicMode ? nil : stream.audioAsset.url

7
Model/Player/PlayerModel.swift
View File

@@ -1575,4 +1575,11 @@ final class PlayerModel: ObservableObject {
var availableAudioTracks: [Stream.AudioTrack] {
(backend as? MPVBackend)?.availableAudioTracks ?? []
}
var selectedAudioTrack: Stream.AudioTrack? {
let tracks = availableAudioTracks
guard !tracks.isEmpty else { return nil }
let safeIndex = min(max(0, selectedAudioTrackIndex), tracks.count - 1)
return tracks[safeIndex]
}
}

4
Shared/Player/Controls/ControlsOverlay.swift
View File

@@ -458,7 +458,7 @@ struct ControlsOverlay: View {
Menu {
audioTrackPicker
} label: {
Text(player.availableAudioTracks[player.selectedAudioTrackIndex].displayLanguage)
Text(player.selectedAudioTrack?.displayLanguage ?? "Original")
.frame(maxWidth: 240, alignment: .trailing)
}
.transaction { t in t.animation = .none }
@@ -468,7 +468,7 @@ struct ControlsOverlay: View {
.frame(height: 40)
#else
ControlsOverlayButton(focusedField: $focusedField, field: .audioTrack) {
Text(player.availableAudioTracks[player.selectedAudioTrackIndex].displayLanguage)
Text(player.selectedAudioTrack?.displayLanguage ?? "Original")
.frame(maxWidth: 320)
}
.contextMenu {

4
Shared/Player/PlaybackSettings.swift
View File

@@ -503,7 +503,7 @@ struct PlaybackSettings: View {
Menu {
audioTrackPicker
} label: {
Text(player.availableAudioTracks[player.selectedAudioTrackIndex].displayLanguage)
Text(player.selectedAudioTrack?.displayLanguage ?? "Original")
.frame(maxWidth: 240, alignment: .trailing)
}
.transaction { t in t.animation = .none }
@@ -513,7 +513,7 @@ struct PlaybackSettings: View {
.frame(height: 40)
#else
ControlsOverlayButton(focusedField: $focusedField, field: .audioTrack) {
Text(player.availableAudioTracks[player.selectedAudioTrackIndex].displayLanguage)
Text(player.selectedAudioTrack?.displayLanguage ?? "Original")
.frame(maxWidth: 320)
}
.contextMenu {