Skip to content

Commit

Permalink
Fix MoodbarPipeline crash on gstreamer error.
Browse files Browse the repository at this point in the history
As reported in issue 6302, playing a stream that causes gstreamer to error at
start can cause a crash. The problem occurs when the MoodbarPipeline receives a
pad-added signal after it has handled an error callback. In the error callback,
the builder_ is freed. In the pad-added handler (NewPadCallback), this object
is accessed.

This change adds a running_ flag that is set when the pipeline is started and
cleared on an error, end of stream, or object destruction. We check this flag at
the beginning of NewPadCallback. For sanity sake, we also check the builder_
pointer before dereferencing. Note that checking the state of the pipeline
wasn't an option since the pipeline is in the process of changing states during
the pad-added callback and gst_element_get_state wants to block during a state
change.

This solution is not complete as there are still some syncronization issues.
With this specific situation, the error and new pad callbacks appear to always
occur on the same thread, but that's probably not true for all error conditions.
The object is also destroyed by a different thread, so it may be possible that a
callback can occur at the wrong time during or after the deletion of the object.

See clementine-player/Clementine#6302
  • Loading branch information
jbroadus committed Mar 18, 2019
1 parent b56e034 commit 8170d49
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
17 changes: 15 additions & 2 deletions src/moodbar/moodbarpipeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ MoodbarPipeline::MoodbarPipeline(const QUrl& local_filename)
local_filename_(local_filename),
pipeline_(nullptr),
convert_element_(nullptr),
success_(false) {}
success_(false),
running_(false) {}

MoodbarPipeline::~MoodbarPipeline() { Cleanup(); }

Expand Down Expand Up @@ -117,6 +118,7 @@ void MoodbarPipeline::Start() {
gst_object_unref(bus);

// Start playing
running_ = true;
gst_element_set_state(pipeline_, GST_STATE_PLAYING);
}

Expand All @@ -135,6 +137,12 @@ void MoodbarPipeline::ReportError(GstMessage* msg) {

void MoodbarPipeline::NewPadCallback(GstElement*, GstPad* pad, gpointer data) {
MoodbarPipeline* self = reinterpret_cast<MoodbarPipeline*>(data);

if (!self->running_) {
qLog(Warning) << "Received gstreamer callback after pipeline has stopped.";
return;
}

GstPad* const audiopad =
gst_element_get_static_pad(self->convert_element_, "sink");

Expand All @@ -152,7 +160,10 @@ void MoodbarPipeline::NewPadCallback(GstElement*, GstPad* pad, gpointer data) {
gst_structure_get_int(structure, "rate", &rate);
gst_caps_unref(caps);

self->builder_->Init(kBands, rate);
if (self->builder_ != nullptr)
self->builder_->Init(kBands, rate);
else
qLog(Error) << "Builder does not exist";
}

GstBusSyncReply MoodbarPipeline::BusCallbackSync(GstBus*, GstMessage* msg,
Expand All @@ -177,6 +188,7 @@ GstBusSyncReply MoodbarPipeline::BusCallbackSync(GstBus*, GstMessage* msg,

void MoodbarPipeline::Stop(bool success) {
success_ = success;
running_ = false;
if (builder_ != nullptr) {
data_ = builder_->Finish(1000);
builder_.reset();
Expand All @@ -189,6 +201,7 @@ void MoodbarPipeline::Cleanup() {
Q_ASSERT(QThread::currentThread() == thread());
Q_ASSERT(QThread::currentThread() != qApp->thread());

running_ = false;
if (pipeline_) {
GstBus* bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline_));
gst_bus_set_sync_handler(bus, nullptr, nullptr, nullptr);
Expand Down
1 change: 1 addition & 0 deletions src/moodbar/moodbarpipeline.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class MoodbarPipeline : public QObject {
std::unique_ptr<MoodbarBuilder> builder_;

bool success_;
bool running_;
QByteArray data_;
};

Expand Down

0 comments on commit 8170d49

Please sign in to comment.