Fix use-after free (signal after deleting group)

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 3adce69bf9512132d0b0969793784018dd0251b1..8f076fe84efcb8dd6d79a938c5fe4bffda6f9fe4 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -745,10 +745,10 @@ GroupTabs::set_activation (RouteGroup* g, bool a)
 void
 GroupTabs::remove_group (RouteGroup* g)
 {
-       RouteList rl (*(g->route_list().get()));
+       boost::shared_ptr<RouteList> rl (g->route_list ());
        _session->remove_route_group (*g);
 
-       emit_gui_changed_for_members (g);
+       emit_gui_changed_for_members (rl);
 }
 
 /** Set the color of the tab of a route group */
@@ -822,7 +822,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg)
           for our routes.
        */
 
-       emit_gui_changed_for_members (rg);
+       emit_gui_changed_for_members (rg->route_list ());
 
        set_dirty ();
 }
@@ -858,11 +858,11 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w
 }
 
 void
-GroupTabs::emit_gui_changed_for_members (RouteGroup* rg)
+GroupTabs::emit_gui_changed_for_members (boost::shared_ptr<RouteList> rl)
 {
        PresentationInfo::ChangeSuspender cs;
 
-       for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) {
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                (*i)->presentation_info().PropertyChanged (Properties::color);
        }
 }

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index fc8f50b2bc9fb46ac50e5c0e82c73725bf8e3273..fa32f7cf8d21240375392d4bca2bf91c423488eb 100644 (file)
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -70,7 +70,7 @@ protected:
        };
 
 private:
-       static void emit_gui_changed_for_members (ARDOUR::RouteGroup *);
+       static void emit_gui_changed_for_members (boost::shared_ptr<ARDOUR::RouteList>);
 
        /** Compute all the tabs for this widget.
         *  @return Tabs.