smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash when cleaning up w/o destroying session

Browse source 
- Control-protocols may transmit data during cleanup
 (e.g. reset surface), and need the Audio-engine to do so.
- destroying the ControlProtocolManager w/o the Session calling
 ::drop_protocols(), lead to a double free.
This commit is contained in:
Robin Gareus 2017-08-03 18:43:12 +02:00
parent 81f12f602b
commit d0c934a9de
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/control_protocol_manager.cc
View file

@ -76,6 +76,7 @@ ControlProtocolManager::~ControlProtocolManager()
for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) { for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) {
(*p)->protocol = 0; // protocol was already destroyed above.
delete (*p); delete (*p);
} }

2
libs/ardour/globals.cc
View file

@ -597,13 +597,13 @@ ARDOUR::cleanup ()
return; return;
} }
delete &ControlProtocolManager::instance();
ARDOUR::AudioEngine::destroy (); ARDOUR::AudioEngine::destroy ();
delete Library; delete Library;
#ifdef HAVE_LRDF #ifdef HAVE_LRDF
lrdf_cleanup (); lrdf_cleanup ();
#endif #endif
delete &ControlProtocolManager::instance();
#ifdef WINDOWS_VST_SUPPORT #ifdef WINDOWS_VST_SUPPORT
fst_exit (); fst_exit ();
#endif #endif