ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Prevent crashes when trying to add/remove IOPlug ports 

IOPlugins pinout is not [yet] configurable. Trying to add ports
resuled in a segfault since the BufferSet was not resized
(nor the plugin reconfigured)
This commit is contained in:
Robin Gareus 2024-03-13 03:56:01 +01:00
parent 069bf034ab
commit 9e9fd201b5
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/io_plug.h
View File

@ -161,6 +161,7 @@ private:
BufferSet _bufs;
std::shared_ptr<IO> _input;
std::shared_ptr<IO> _output;
bool _configuring_io;
PortManager::AudioInputPorts _audio_input_ports;
PortManager::MIDIInputPorts _midi_input_ports;

10
libs/ardour/io_plug.cc
View File

@ -18,6 +18,7 @@
#include <cassert>
#include "pbd/types_convert.h"
#include "pbd/unwind.h"
#include "pbd/xml++.h"
#include "temporal/tempo.h"
@ -46,6 +47,7 @@ IOPlug::IOPlug (Session& s, std::shared_ptr<Plugin> p, bool pre)
, _plugin (p)
, _pre (pre)
, _plugin_signal_latency (0)
, _configuring_io (false)
, _window_proxy (0)
{
_stat_reset.store (0);
@ -57,6 +59,12 @@ IOPlug::IOPlug (Session& s, std::shared_ptr<Plugin> p, bool pre)
}
_input.reset (new IO (_session, io_name (), IO::Input));
_output.reset (new IO (_session, io_name (), IO::Output));
/* do not allow to add/remove ports (for now).
* when adding ports _buf will needs to be resized.
*/
_input->PortCountChanging.connect_same_thread (*this, [this](ChanCount) { return !_configuring_io; });
_output->PortCountChanging.connect_same_thread (*this, [this](ChanCount) { return !_configuring_io; });
}
IOPlug::~IOPlug ()
@ -380,6 +388,8 @@ IOPlug::ui_elements () const
bool
IOPlug::ensure_io ()
{
PBD::Unwinder<bool> uw (_configuring_io, true);
/* must be called with process-lock held */
if (_input->ensure_io (_n_in, false, this) != 0) {
return false;