From 2c6d92ec960a7dd70889389e58f6ee84a1e9b0a9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 30 Dec 2015 03:51:00 -0500 Subject: safer housekeeping for control protocol descriptors --- libs/ardour/control_protocol_manager.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index b97c89b809..3856743e70 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -223,10 +223,16 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi) } cpi.protocol = 0; + delete cpi.state; cpi.state = 0; - delete (Glib::Module*)cpi.descriptor->module; - cpi.descriptor->module = 0; + + delete (Glib::Module*) cpi.descriptor->module; + /* cpi->descriptor is now inaccessible since dlclose() or equivalent + * has been performed, and the descriptor is (or could be) a static + * object made accessible by dlopen(). + */ + cpi.descriptor = 0; ProtocolStatusChange (&cpi); -- cgit v1.2.3