RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 22:58:11 +00:00
Code Issues Activity Actions

Ladybird+LibWeb+WebContent: Prevent out-of-bounds seeking audio elements

Browse source 
It's currently possible to seek to the total sample count of an audio
loader. We must limit seeking to one less than that count.

This mistake was duplicated in both AudioCodecPluginSerenity/Ladybird,
so the computation was moved to a helper in the base AudioCodecPlugin.
This commit is contained in:
Timothy Flynn 2023-06-21 19:37:10 -04:00 • committed by Andreas Kling
parent 20edbb70f8
commit bcd222cfae
4 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Ladybird/AudioCodecPluginLadybird.cpp
View file

@ -160,22 +160,14 @@ private:
paused = Paused::Yes;
break;
case AudioTask::Type::Seek: {
case AudioTask::Type::Seek:
VERIFY(task.data.has_value());
auto position = *task.data;
m_position = Web::Platform::AudioCodecPlugin::set_loader_position(m_loader, *task.data, m_duration, audio_output->format().sampleRate());
auto duration = static_cast<double>(this->duration().to_milliseconds()) / 1000.0;
position = position / duration * static_cast<double>(m_loader->total_samples());
m_loader->seek(static_cast<int>(position)).release_value_but_fixme_should_propagate_errors();
if (paused == Paused::Yes) {
m_position = Web::Platform::AudioCodecPlugin::current_loader_position(m_loader, audio_output->format().sampleRate());
if (paused == Paused::Yes)
Q_EMIT playback_position_updated(m_position);
}
break;
}
case AudioTask::Type::Volume:
VERIFY(task.data.has_value());

12
Userland/Libraries/LibWeb/Platform/AudioCodecPlugin.cpp
View file

@ -40,6 +40,18 @@ ErrorOr<FixedArray<Audio::Sample>> AudioCodecPlugin::read_samples_from_loader(Au
return FixedArray<Audio::Sample>::create(resampler.resample(buffer_or_error.release_value()).span());
}
Duration AudioCodecPlugin::set_loader_position(Audio::Loader& loader, double position, Duration duration, size_t device_sample_rate)
{
if (loader.total_samples() == 0)
return current_loader_position(loader, device_sample_rate);
auto duration_value = static_cast<double>(duration.to_milliseconds()) / 1000.0;
position = position / duration_value * static_cast<double>(loader.total_samples() - 1);
loader.seek(static_cast<int>(position)).release_value_but_fixme_should_propagate_errors();
return current_loader_position(loader, device_sample_rate);
}
Duration AudioCodecPlugin::current_loader_position(Audio::Loader const& loader, size_t device_sample_rate)
{
auto samples_played = static_cast<double>(loader.loaded_samples());

1
Userland/Libraries/LibWeb/Platform/AudioCodecPlugin.h
View file

@ -24,6 +24,7 @@ public:
virtual ~AudioCodecPlugin();
static ErrorOr<FixedArray<Audio::Sample>> read_samples_from_loader(Audio::Loader&, size_t samples_to_load, size_t device_sample_rate);
static Duration set_loader_position(Audio::Loader&, double position, Duration duration, size_t device_sample_rate);
static Duration current_loader_position(Audio::Loader const&, size_t device_sample_rate);
virtual void resume_playback() = 0;

6
Userland/Services/WebContent/AudioCodecPluginSerenity.cpp
View file

@ -90,11 +90,7 @@ void AudioCodecPluginSerenity::set_volume(double volume)
void AudioCodecPluginSerenity::seek(double position)
{
auto duration = static_cast<double>(this->duration().to_milliseconds()) / 1000.0;
position = position / duration * static_cast<double>(m_loader->total_samples());
m_loader->seek(static_cast<int>(position)).release_value_but_fixme_should_propagate_errors();
m_position = current_loader_position(m_loader, m_device_sample_rate);
m_position = set_loader_position(m_loader, position, m_duration, m_device_sample_rate);
if (on_playback_position_updated)
on_playback_position_updated(m_position);