mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-05 01:10:24 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

LibMedia: Pass SeekData by reference to avoid an inexplicable leak
Some checks failed
Close stale PRs / stale (push) Has been cancelled
Details
Package the js repl as a binary artifact / Linux, arm64 (push) Has been cancelled
Details
Package the js repl as a binary artifact / macOS, arm64 (push) Has been cancelled
Details
Package the js repl as a binary artifact / Linux, x86_64 (push) Has been cancelled
Details
Label PRs with merge conflicts / auto-labeler (push) Has been cancelled
Details
Nightly Lagom / Linux, arm64, Distribution, Clang (push) Has been cancelled
Details
Nightly Lagom / macOS, arm64, Distribution, Clang (push) Has been cancelled
Details
Nightly Lagom / Linux, arm64, Sanitizer, Clang (push) Has been cancelled
Details
Nightly Lagom / macOS, arm64, Sanitizer, Swift (push) Has been cancelled
Details
Nightly Lagom / Linux, x86_64, Distribution, GNU (push) Has been cancelled
Details
Nightly Lagom / Linux, x86_64, Sanitizer, Swift (push) Has been cancelled
Details
Nightly Lagom / Windows, x86_64, Windows_Sanitizer_CI, ClangCL (push) Has been cancelled
Details
Nightly Lagom / Flatpak aarch64 (push) Has been cancelled
Details
Nightly Lagom / Flatpak x86_64 (push) Has been cancelled
Details

Browse Source 
For some reason, it seems that passing NonnullRefPtr<SeekData> const&
was causing us to triple ref() in the capture group for the audio seek
handlers, followed by only a single unref(). Changing this to plain old
SeekData& inexplicably fixes the leak.
This commit is contained in:
Zaggy1024
2025-12-02 16:47:54 -06:00
committed by Gregory Bertilson
parent e935dfbf5b
commit 970100e789
Notes: github-actions[bot] 2025-12-02 23:20:49 +00:00 
Author: https://github.com/Zaggy1024
Commit: https://github.com/LadybirdBrowser/ladybird/commit/970100e7893
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/7000
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Libraries/LibMedia/PlaybackStates/SeekingStateHandler.h
View File

@@ -103,21 +103,21 @@ private:
return count;
}
static void begin_audio_seeks(NonnullRefPtr<SeekData> const& seek_data)
static void begin_audio_seeks(SeekData& seek_data)
{
seek_data->audio_seeks_in_flight = count_audio_tracks(seek_data->manager);
seek_data.audio_seeks_in_flight = count_audio_tracks(seek_data.manager);
if (seek_data->audio_seeks_in_flight == 0) {
possibly_complete_seek(*seek_data);
if (seek_data.audio_seeks_in_flight == 0) {
possibly_complete_seek(seek_data);
return;
}
for (auto const& audio_track_data : seek_data->manager->m_audio_track_datas) {
if (seek_data->manager->m_audio_sink->provider(audio_track_data.track) == nullptr)
for (auto const& audio_track_data : seek_data.manager->m_audio_track_datas) {
if (seek_data.manager->m_audio_sink->provider(audio_track_data.track) == nullptr)
continue;
audio_track_data.provider->seek(seek_data->chosen_timestamp, [seek_data]() {
audio_track_data.provider->seek(seek_data.chosen_timestamp, [seek_data = NonnullRefPtr(seek_data)]() {
seek_data->audio_seeks_completed++;
possibly_complete_seek(*seek_data);
possibly_complete_seek(seek_data);
});
}
}
@@ -151,7 +151,7 @@ private:
seek_data->video_seeks_completed++;
if (seek_mode == SeekMode::Accurate)
possibly_complete_seek(*seek_data);
possibly_complete_seek(seek_data);
else if (seek_data->video_seeks_completed == seek_data->video_seeks_in_flight)
begin_audio_seeks(seek_data);
});