From 9887cd7feb7c377a3d046b924fe86907479be413 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 28 Nov 2016 15:53:59 +0100 Subject: Qt: fix crash when closing RTP player while playing For some time, the RTP Player has been crashing for me (Arch Linux, Qt 5.7.0) when the RTP Player is active (affects also Wireshark 2.0.5). This call trace was observed: + RtpPlayerDialog::reject (closing dialog via Escape / Close button) + RtpAudioStream::stopPlaying + RtpAudioStream::outputStateChanged(QAudio::StoppedState) + QAudioOutput::deleteLater // problematic! + RtpPlayerDialog::~RtpPlayerDialog + RtpAudioStream::~RtpAudioStream As the QAudioOutput instance is a child of RtpAudioStream, it is also destroyed after that. QAudioOutput's destructor somehow invokes (via libqtmedia_pulse.so) a main loop iteration which invokes the previously scheduled deleteLater call. As QAudioOutput was already being destructed, this results in a crash. Workaround this by removing this child from RtpAudioStream (no cruelty intended). Change-Id: I88f2e929ac566534be5d2270e2e0b194685533eb Reviewed-on: https://code.wireshark.org/review/18970 Petri-Dish: Peter Wu Reviewed-by: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu --- ui/qt/rtp_audio_stream.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ui') diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp index 7154d8df7a..1d8971c1d1 100644 --- a/ui/qt/rtp_audio_stream.cpp +++ b/ui/qt/rtp_audio_stream.cpp @@ -576,6 +576,9 @@ void RtpAudioStream::outputStateChanged(QAudio::State new_state) switch (new_state) { case QAudio::StoppedState: // RTP_STREAM_DEBUG("stopped %f", audio_output_->processedUSecs() / 100000.0); + // Detach from parent (RtpAudioStream) to prevent deleteLater from being + // run during destruction of this class. + audio_output_->setParent(0); audio_output_->disconnect(); audio_output_->deleteLater(); audio_output_ = NULL; -- cgit v1.2.3