Fix segfault on VST plugin I/O change

LMMS · Sep 7, 2017 · 7429cb8155238dbc839bac45d6400740bb63e72d · 7429cb8
1 parent fe98a9a
commit 7429cb8155238dbc839bac45d6400740bb63e72d
Unified Split

Showing with 66 additions and 4 deletions.

+10 −0 include/RemotePlugin.h

+50 −4 plugins/vst_base/RemoteVstPlugin.cpp

+6 −0 src/core/RemotePlugin.cpp
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
@@ -424,6 +424,7 @@ enum RemoteMessageIDs
 	IdChangeSharedMemoryKey,
 	IdChangeInputCount,
 	IdChangeOutputCount,
+	IdChangeInputOutputCount,
 	IdShowUI,
 	IdHideUI,
 	IdSaveSettingsToString,
@@ -919,6 +920,15 @@ class RemotePluginClient : public RemotePluginBase
 		sendMessage( message( IdChangeOutputCount ).addInt( _i ) );
 	}

+	void setInputOutputCount( int i, int o )
+	{
+		m_inputCount = i;
+		m_outputCount = o;
+		sendMessage( message( IdChangeInputOutputCount )
+				.addInt( i )
+				.addInt( o ) );
+	}
+
 	virtual int inputCount() const
 	{
 		return m_inputCount;
diff --git a/plugins/vst_base/RemoteVstPlugin.cpp b/plugins/vst_base/RemoteVstPlugin.cpp
@@ -249,6 +249,26 @@ class RemoteVstPlugin : public RemotePluginClient
 		pthread_mutex_unlock( &m_pluginLock );
 	}

+	inline void lockShm()
+	{
+		pthread_mutex_lock( &m_shmLock );
+	}
+
+	inline void unlockShm()
+	{
+		pthread_mutex_unlock( &m_shmLock );
+	}
+
+	inline bool isShmValid()
+	{
+		return m_shmValid;
+	}
+
+	inline void setShmIsValid( bool valid )
+	{
+		m_shmValid = valid;
+	}
+
 	inline bool isProcessing() const
 	{
 		return m_processing;
@@ -347,6 +367,9 @@ class RemoteVstPlugin : public RemotePluginClient
 	float * * m_inputs;
 	float * * m_outputs;

+	pthread_mutex_t m_shmLock;
+	bool m_shmValid;
+
 	typedef std::vector<VstMidiEvent> VstMidiEventList;
 	VstMidiEventList m_midiEvents;

@@ -392,6 +415,8 @@ RemoteVstPlugin::RemoteVstPlugin( const char * socketPath ) :
 	m_shouldGiveIdle( false ),
 	m_inputs( NULL ),
 	m_outputs( NULL ),
+	m_shmLock(),
+	m_shmValid( false ),
 	m_midiEvents(),
 	m_bpm( 0 ),
 	m_currentSamplePos( 0 ),
@@ -402,6 +427,7 @@ RemoteVstPlugin::RemoteVstPlugin( const char * socketPath ) :

 {
 	pthread_mutex_init( &m_pluginLock, NULL );
+	pthread_mutex_init( &m_shmLock, NULL );

 	__plugin = this;

@@ -500,6 +526,7 @@ RemoteVstPlugin::~RemoteVstPlugin()
 	delete[] m_inputs;
 	delete[] m_outputs;

+	pthread_mutex_destroy( &m_shmLock );
 	pthread_mutex_destroy( &m_pluginLock );
 }

@@ -836,6 +863,16 @@ void RemoteVstPlugin::process( const sampleFrame * _in, sampleFrame * _out )

 	// now we're ready to fetch sound from VST-plugin

+	lock();
+	lockShm();
+
+	if( !isShmValid() )
+	{
+		unlockShm();
+		unlock();
+		return;
+	}
+
 	for( int i = 0; i < inputCount(); ++i )
 	{
 		m_inputs[i] = &((float *) _in)[i * bufferSize()];
@@ -847,8 +884,6 @@ void RemoteVstPlugin::process( const sampleFrame * _in, sampleFrame * _out )
 		memset( m_outputs[i], 0, bufferSize() * sizeof( float ) );
 	}

-	lock();
-
 #ifdef OLD_VST_SDK
 	if( m_plugin->flags & effFlagsCanReplacing )
 	{
@@ -864,6 +899,7 @@ void RemoteVstPlugin::process( const sampleFrame * _in, sampleFrame * _out )
 	}
 #endif

+	unlockShm();
 	unlock();

 	m_currentSamplePos += bufferSize();
@@ -1380,14 +1416,19 @@ void RemoteVstPlugin::loadChunkFromFile( const std::string & _file, int _len )

 void RemoteVstPlugin::updateInOutCount()
 {
+	lockShm();
+
+	setShmIsValid( false );
+
+	unlockShm();
+
 	delete[] m_inputs;
 	delete[] m_outputs;

 	m_inputs = NULL;
 	m_outputs = NULL;

-	setInputCount( inputCount() );
-	setOutputCount( outputCount() );
+	setInputOutputCount( inputCount(), outputCount() );

 	char buf[64];
 	sprintf( buf, "inputs: %d  output: %d\n", inputCount(), outputCount() );
@@ -1842,6 +1883,11 @@ DWORD WINAPI RemoteVstPlugin::processingThread( LPVOID _param )
 		{
 			_this->processMessage( m );
 		}
+		else if( m.id == IdChangeSharedMemoryKey )
+		{
+			_this->processMessage( m );
+			_this->setShmIsValid( true );
+		}
 		else
 		{
 			PostMessage( __MessageHwnd,
diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
@@ -481,6 +481,12 @@ bool RemotePlugin::processMessage( const message & _m )
 			resizeSharedProcessingMemory();
 			break;

+		case IdChangeInputOutputCount:
+			m_inputCount = _m.getInt( 0 );
+			m_outputCount = _m.getInt( 1 );
+			resizeSharedProcessingMemory();
+			break;
+
 		case IdDebugMessage:
 			fprintf( stderr, "RemotePlugin::DebugMessage: %s",
 						_m.getString( 0 ).c_str() );