From 2e89fe24b633b291726bf25c7291f2acd089f886 Mon Sep 17 00:00:00 2001
From: Mark Rowe <mark@vector35.com>
Date: Mon, 11 May 2026 18:58:12 -0700
Subject: Fix leaks due to unclear ownership of Menu instances

---
 ui/taglist.h         | 2 ++
 ui/tagtypelist.h     | 2 ++
 ui/workflowmonitor.h | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/taglist.h b/ui/taglist.h
index e19d899a..556d0771 100644
--- a/ui/taglist.h
+++ b/ui/taglist.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QItemSelectionModel>
 #include <QtWidgets/QTreeView>
@@ -131,6 +132,7 @@ class BINARYNINJAUIAPI TagList : public QTreeView, public FilterTarget
 	UIActionHandler m_actionHandler;
 	ContextMenuManager* m_contextMenuManager;
 	FilteredView* m_filterView;
+	std::unique_ptr<Menu> m_ownedMenu;
 	Menu* m_menu;
 	std::mutex m_filterMutex;
 
diff --git a/ui/tagtypelist.h b/ui/tagtypelist.h
index 62950405..ae0b4ebf 100644
--- a/ui/tagtypelist.h
+++ b/ui/tagtypelist.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QItemSelectionModel>
 #include <QtWidgets/QTableView>
@@ -99,6 +100,7 @@ class BINARYNINJAUIAPI TagTypeList : public QTableView, public BinaryNinja::Bina
 	UIActionHandler* m_handler;
 	UIActionHandler m_actionHandler;
 	ContextMenuManager* m_contextMenuManager;
+	std::unique_ptr<Menu> m_ownedMenu;
 	Menu* m_menu;
 
 	QTimer* m_updateTimer;
diff --git a/ui/workflowmonitor.h b/ui/workflowmonitor.h
index 35757c46..7f45b7a5 100644
--- a/ui/workflowmonitor.h
+++ b/ui/workflowmonitor.h
@@ -25,7 +25,7 @@ class BINARYNINJAUIAPI WorkflowMonitorWidget : public QWidget
 	FunctionRef m_function;
 	WorkflowRef m_workflow;
 
-	Menu* m_menu;
+	Menu m_menu;
 	ContextMenuManager* m_contextMenuManager;
 	UIActionHandler m_actionHandler;
 
-- 
cgit v1.3.1