ardour/livetrax
13
0
Fork 0
Code

Fix heap-use-after-free at exit

Browse Source 
Deleting _track_canvas_viewport automatically destroys
any child Items. The LocationMarker's group was already destroyed
when ~ArdourMarker() runs and calls `delete group`.

So first delete the marker, then the canvas
This commit is contained in:
Robin Gareus 2023-06-08 22:39:14 +02:00
parent 733d59c65b
commit a5946ba2e2
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.cc
View File

@ -290,6 +290,7 @@ Editor::Editor ()
, cd_marker_group (0) , cd_marker_group (0)
, _time_markers_group (0) , _time_markers_group (0)
, _selection_marker_group (0) , _selection_marker_group (0)
, _selection_marker (new LocationMarkers)
, hv_scroll_group (0) , hv_scroll_group (0)
, h_scroll_group (0) , h_scroll_group (0)
, cursor_scroll_group (0) , cursor_scroll_group (0)
@ -887,6 +888,7 @@ Editor::~Editor()
delete new_transport_marker_menu; delete new_transport_marker_menu;
delete editor_ruler_menu; delete editor_ruler_menu;
delete _popup_region_menu_item; delete _popup_region_menu_item;
delete _selection_marker;
delete button_bindings; delete button_bindings;
delete _routes; delete _routes;

2
gtk2_ardour/editor.h
View File

@ -928,7 +928,7 @@ private:
/* parent for group for selection marker (above ruler) */ /* parent for group for selection marker (above ruler) */
ArdourCanvas::Container* _selection_marker_group; ArdourCanvas::Container* _selection_marker_group;
LocationMarkers _selection_marker; LocationMarkers* _selection_marker;
/* The group containing all other groups that are scrolled vertically /* The group containing all other groups that are scrolled vertically
and horizontally. and horizontally.

4
gtk2_ardour/editor_canvas.cc
View File

@ -146,8 +146,8 @@ Editor::initialize_canvas ()
/* group above rulers, to show selection triangles */ /* group above rulers, to show selection triangles */
_selection_marker_group = new ArdourCanvas::Container (h_scroll_group); _selection_marker_group = new ArdourCanvas::Container (h_scroll_group);
CANVAS_DEBUG_NAME (_selection_marker_group, "Canvas Selection Ruler"); CANVAS_DEBUG_NAME (_selection_marker_group, "Canvas Selection Ruler");
_selection_marker.start = new SelectionMarker (*this, *_selection_marker_group, "play head", ArdourMarker::SelectionStart); _selection_marker->start = new SelectionMarker (*this, *_selection_marker_group, "play head", ArdourMarker::SelectionStart);
_selection_marker.end = new SelectionMarker (*this, *_selection_marker_group, "play head", ArdourMarker::SelectionEnd); _selection_marker->end = new SelectionMarker (*this, *_selection_marker_group, "play head", ArdourMarker::SelectionEnd);
_selection_marker_group->raise_to_top (); _selection_marker_group->raise_to_top ();
/* Note that because of ascending-y-axis coordinates, this order is /* Note that because of ascending-y-axis coordinates, this order is

6
gtk2_ardour/editor_markers.cc
View File

@ -2019,12 +2019,12 @@ Editor::update_selection_markers ()
{ {
timepos_t start, end; timepos_t start, end;
if (get_selection_extents (start, end)) { if (get_selection_extents (start, end)) {
_selection_marker.set_position (start, end); _selection_marker->set_position (start, end);
_selection_marker.show (); _selection_marker->show ();
ActionManager::get_action ("Editor", "cut-paste-section")->set_sensitive (true); ActionManager::get_action ("Editor", "cut-paste-section")->set_sensitive (true);
ActionManager::get_action ("Editor", "copy-paste-section")->set_sensitive (true); ActionManager::get_action ("Editor", "copy-paste-section")->set_sensitive (true);
} else { } else {
_selection_marker.hide (); _selection_marker->hide ();
ActionManager::get_action ("Editor", "cut-paste-section")->set_sensitive (false); ActionManager::get_action ("Editor", "cut-paste-section")->set_sensitive (false);
ActionManager::get_action ("Editor", "copy-paste-section")->set_sensitive (false); ActionManager::get_action ("Editor", "copy-paste-section")->set_sensitive (false);
} }