Skip to content

media: fix heap-use-after-free in CobaltAudioRendererSink #9035

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

Merged
kjyoun merged 4 commits into from
Feb 27, 2026
Merged

media: fix heap-use-after-free in CobaltAudioRendererSink #9035

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
063d009
cobalt/media/audio: fix heap-use-after-free in CobaltAudioRendererSink
kjyoun Feb 10, 2026
e2fe4f6
add unique ptr alias
kjyoun Feb 10, 2026
b34dad8
minor change: fast-fail in deleter
kjyoun Feb 10, 2026
ef6ba94
Remove unnecessary invalid check
kjyoun Feb 13, 2026
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
24 changes: 15 additions & 9 deletions cobalt/media/audio/cobalt_audio_renderer_sink.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ int AlignUp(int value, int alignment) {
}
} // namespace

void SbAudioSinkDeleter::operator()(SbAudioSink sink) const {
if (SbAudioSinkIsValid(sink)) {
SbAudioSinkDestroy(sink);
}
}

void CobaltAudioRendererSink::Initialize(const AudioParameters& params,
RenderCallback* callback) {
LOG(INFO) << "CobaltAudioRendererSink::Initialize - called with following "
Expand Down Expand Up @@ -78,17 +84,17 @@ void CobaltAudioRendererSink::Start() {
}

output_frame_buffers_[0] = output_frame_buffer_.get();
audio_sink_ = SbAudioSinkCreate(
audio_sink_ = AudioSinkUniquePtr(SbAudioSinkCreate(
params_.channels(), nearest_supported_sample_rate_, output_sample_type_,
kSbMediaAudioFrameStorageTypeInterleaved, &output_frame_buffers_[0],
frames_per_channel_, &CobaltAudioRendererSink::UpdateSourceStatusFunc,
&CobaltAudioRendererSink::ConsumeFramesFunc, this);
DCHECK(SbAudioSinkIsValid(audio_sink_));
&CobaltAudioRendererSink::ConsumeFramesFunc, /*context=*/this));
CHECK(audio_sink_);
}

void CobaltAudioRendererSink::Stop() {
is_eos_reached_.store(true);
SbAudioSinkDestroy(audio_sink_);
audio_sink_.reset();
callback_ = nullptr;
}

Expand All @@ -101,22 +107,22 @@ void CobaltAudioRendererSink::Pause() {
}

void CobaltAudioRendererSink::Flush() {
if (!SbAudioSinkIsValid(audio_sink_)) {
if (!audio_sink_) {
return;
}
// TODO(b/390468794) consolidate this recreation as it duplicates code from
// Stop() and Start()
SbAudioSinkDestroy(audio_sink_);
audio_sink_.reset();
frames_rendered_ = 0;
frames_consumed_ = 0;
audio_sink_ = SbAudioSinkCreate(
audio_sink_ = AudioSinkUniquePtr(SbAudioSinkCreate(
params_.channels(),
SbAudioSinkGetNearestSupportedSampleFrequency(params_.sample_rate()),
output_sample_type_, kSbMediaAudioFrameStorageTypeInterleaved,
&output_frame_buffers_[0], frames_per_channel_,
&CobaltAudioRendererSink::UpdateSourceStatusFunc,
&CobaltAudioRendererSink::ConsumeFramesFunc, this);
DCHECK(SbAudioSinkIsValid(audio_sink_));
&CobaltAudioRendererSink::ConsumeFramesFunc, /*context=*/this));
CHECK(audio_sink_);
}

bool CobaltAudioRendererSink::SetVolume(double volume) {
Expand Down
10 changes: 9 additions & 1 deletion cobalt/media/audio/cobalt_audio_renderer_sink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#define COBALT_MEDIA_AUDIO_COBALT_AUDIO_RENDERER_SINK_H_

#include <atomic>
#include <memory>

#include "media/base/audio_renderer_sink.h"
#include "media/base/media_export.h"
Expand All @@ -24,6 +25,12 @@

namespace media {

// Custom deleter for Starboard Audio Sink.
struct SbAudioSinkDeleter {
using pointer = SbAudioSink;
void operator()(SbAudioSink sink) const;
};

class MEDIA_EXPORT CobaltAudioRendererSink final : public AudioRendererSink {
public:
CobaltAudioRendererSink() = default;
Expand Down Expand Up @@ -84,7 +91,8 @@ class MEDIA_EXPORT CobaltAudioRendererSink final : public AudioRendererSink {
std::atomic<bool> is_playing_ = false;
std::atomic<bool> is_eos_reached_ = false;

SbAudioSink audio_sink_ = kSbAudioSinkInvalid;
using AudioSinkUniquePtr = std::unique_ptr<SbAudioSink, SbAudioSinkDeleter>;
AudioSinkUniquePtr audio_sink_;

double resample_ratio_ = 1.0;
std::unique_ptr<MultiChannelResampler> resampler_ = nullptr;
Expand Down
Loading