Fix shared_ptr lifetime management for menu and tray icon callbacks

Ensure menu and menu item objects are kept alive via global storage.
Switch tray icon callback data to shared_ptr for safe lambda capture.
Clear tray icon callbacks on destruction to prevent dangling references.
Protect macOS tray icon callbacks against exceptions.

Author: lijy91

src/capi/menu_c.cpp

@@ -3,9 +3,14 @@
 #include <cstring>
 #include <map>
 #include <memory>
+#include <unordered_map>
 
 using namespace nativeapi;
 
+// Global object storage to manage shared_ptr lifetimes
+static std::unordered_map<void*, std::shared_ptr<MenuItem>> g_menu_items;
+static std::unordered_map<void*, std::shared_ptr<Menu>> g_menus;
+
 // Internal structures to manage C callbacks
 struct MenuItemCallbackData {
   native_menu_item_click_callback_t click_callback;
@@ -106,7 +111,9 @@ native_menu_item_t native_menu_item_create(const char* text, native_menu_item_ty
 
   try {
     auto item = MenuItem::Create(text, convert_menu_item_type(type));
-    return static_cast<native_menu_item_t>(item.get());
+    void* handle = item.get();
+    g_menu_items[handle] = item;  // Store shared_ptr to keep object alive
+    return static_cast<native_menu_item_t>(handle);
   } catch (...) {
     return nullptr;
   }
@@ -115,7 +122,9 @@ native_menu_item_t native_menu_item_create(const char* text, native_menu_item_ty
 native_menu_item_t native_menu_item_create_separator(void) {
   try {
     auto item = MenuItem::CreateSeparator();
-    return static_cast<native_menu_item_t>(item.get());
+    void* handle = item.get();
+    g_menu_items[handle] = item;  // Store shared_ptr to keep object alive
+    return static_cast<native_menu_item_t>(handle);
   } catch (...) {
     return nullptr;
   }
@@ -130,8 +139,11 @@ void native_menu_item_destroy(native_menu_item_t item) {
     g_menu_item_callbacks.erase(it);
   }
 
-  // Note: The actual MenuItem object is managed by shared_ptr
-  // This just removes our reference to it
+  // Remove from global storage - this will release the shared_ptr
+  auto item_it = g_menu_items.find(item);
+  if (item_it != g_menu_items.end()) {
+    g_menu_items.erase(item_it);
+  }
 }
 
 native_menu_item_id_t native_menu_item_get_id(native_menu_item_t item) {
@@ -495,7 +507,9 @@ bool native_menu_item_trigger(native_menu_item_t item) {
 native_menu_t native_menu_create(void) {
   try {
     auto menu = Menu::Create();
-    return static_cast<native_menu_t>(menu.get());
+    void* handle = menu.get();
+    g_menus[handle] = menu;  // Store shared_ptr to keep object alive
+    return static_cast<native_menu_t>(handle);
   } catch (...) {
     return nullptr;
   }
@@ -510,8 +524,11 @@ void native_menu_destroy(native_menu_t menu) {
     g_menu_callbacks.erase(it);
   }
 
-  // Note: The actual Menu object is managed by shared_ptr
-  // This just removes our reference to it
+  // Remove from global storage - this will release the shared_ptr
+  auto menu_it = g_menus.find(menu);
+  if (menu_it != g_menus.end()) {
+    g_menus.erase(menu_it);
+  }
 }
 
 native_menu_id_t native_menu_get_id(native_menu_t menu) {
@@ -530,8 +547,11 @@ void native_menu_add_item(native_menu_t menu, native_menu_item_t item) {
 
   try {
     auto menu_ptr = static_cast<Menu*>(menu);
-    auto item_ptr = std::shared_ptr<MenuItem>(static_cast<MenuItem*>(item));
-    menu_ptr->AddItem(item_ptr);
+    // Get the shared_ptr from global storage instead of creating a new one
+    auto item_it = g_menu_items.find(item);
+    if (item_it != g_menu_items.end()) {
+      menu_ptr->AddItem(item_it->second);
+    }
   } catch (...) {
     // Ignore exceptions
   }
@@ -542,8 +562,11 @@ void native_menu_insert_item(native_menu_t menu, native_menu_item_t item, size_t
 
   try {
     auto menu_ptr = static_cast<Menu*>(menu);
-    auto item_ptr = std::shared_ptr<MenuItem>(static_cast<MenuItem*>(item));
-    menu_ptr->InsertItem(index, item_ptr);
+    // Get the shared_ptr from global storage instead of creating a new one
+    auto item_it = g_menu_items.find(item);
+    if (item_it != g_menu_items.end()) {
+      menu_ptr->InsertItem(index, item_it->second);
+    }
   } catch (...) {
     // Ignore exceptions
   }

src/capi/tray_icon_c.cpp

@@ -17,7 +17,7 @@ struct TrayIconCallbackData {
 };
 
 // Global map to store callback data
-static std::map<native_tray_icon_t, std::unique_ptr<TrayIconCallbackData>> g_tray_icon_callbacks;
+static std::map<native_tray_icon_t, std::shared_ptr<TrayIconCallbackData>> g_tray_icon_callbacks;
 
 // TrayIcon C API Implementation
 
@@ -224,16 +224,16 @@ void native_tray_icon_set_on_left_click(native_tray_icon_t tray_icon, native_tra
     // Get or create callback data
     auto it = g_tray_icon_callbacks.find(tray_icon);
     if (it == g_tray_icon_callbacks.end()) {
-      g_tray_icon_callbacks[tray_icon] = std::make_unique<TrayIconCallbackData>();
+      g_tray_icon_callbacks[tray_icon] = std::make_shared<TrayIconCallbackData>();
     }
 
-    auto& callback_data = g_tray_icon_callbacks[tray_icon];
+    auto callback_data = g_tray_icon_callbacks[tray_icon];
     callback_data->left_click_callback = callback;
     callback_data->left_click_user_data = user_data;
 
     if (callback) {
-      tray_icon_ptr->SetOnLeftClick([tray_icon, callback_data = callback_data.get()]() {
-        if (callback_data->left_click_callback) {
+      tray_icon_ptr->SetOnLeftClick([callback_data]() {
+        if (callback_data && callback_data->left_click_callback) {
           callback_data->left_click_callback(callback_data->left_click_user_data);
         }
       });
@@ -254,16 +254,16 @@ void native_tray_icon_set_on_right_click(native_tray_icon_t tray_icon, native_tr
     // Get or create callback data
     auto it = g_tray_icon_callbacks.find(tray_icon);
     if (it == g_tray_icon_callbacks.end()) {
-      g_tray_icon_callbacks[tray_icon] = std::make_unique<TrayIconCallbackData>();
+      g_tray_icon_callbacks[tray_icon] = std::make_shared<TrayIconCallbackData>();
     }
 
-    auto& callback_data = g_tray_icon_callbacks[tray_icon];
+    auto callback_data = g_tray_icon_callbacks[tray_icon];
     callback_data->right_click_callback = callback;
     callback_data->right_click_user_data = user_data;
 
     if (callback) {
-      tray_icon_ptr->SetOnRightClick([tray_icon, callback_data = callback_data.get()]() {
-        if (callback_data->right_click_callback) {
+      tray_icon_ptr->SetOnRightClick([callback_data]() {
+        if (callback_data && callback_data->right_click_callback) {
           callback_data->right_click_callback(callback_data->right_click_user_data);
         }
       });
@@ -284,16 +284,16 @@ void native_tray_icon_set_on_double_click(native_tray_icon_t tray_icon, native_t
     // Get or create callback data
     auto it = g_tray_icon_callbacks.find(tray_icon);
     if (it == g_tray_icon_callbacks.end()) {
-      g_tray_icon_callbacks[tray_icon] = std::make_unique<TrayIconCallbackData>();
+      g_tray_icon_callbacks[tray_icon] = std::make_shared<TrayIconCallbackData>();
     }
 
-    auto& callback_data = g_tray_icon_callbacks[tray_icon];
+    auto callback_data = g_tray_icon_callbacks[tray_icon];
     callback_data->double_click_callback = callback;
     callback_data->double_click_user_data = user_data;
 
     if (callback) {
-      tray_icon_ptr->SetOnDoubleClick([tray_icon, callback_data = callback_data.get()]() {
-        if (callback_data->double_click_callback) {
+      tray_icon_ptr->SetOnDoubleClick([callback_data]() {
+        if (callback_data && callback_data->double_click_callback) {
           callback_data->double_click_callback(callback_data->double_click_user_data);
         }
       });

src/platform/macos/tray_icon_macos.mm

@@ -72,6 +72,12 @@ - (void)statusItemRightClicked:(id)sender;
 }
 
 TrayIcon::~TrayIcon() {
+  // Clear callbacks to prevent dangling function objects
+  if (pimpl_) {
+    pimpl_->on_left_click_ = nullptr;
+    pimpl_->on_right_click_ = nullptr;
+    pimpl_->on_double_click_ = nullptr;
+  }
   delete pimpl_;
 }
 
@@ -255,19 +261,31 @@ - (void)statusItemRightClicked:(id)sender;
 // Internal method to handle click events
 void TrayIcon::HandleLeftClick() {
   if (pimpl_->on_left_click_) {
-    pimpl_->on_left_click_();
+    try {
+      pimpl_->on_left_click_();
+    } catch (...) {
+      // Protect against callback exceptions
+    }
   }
 }
 
 void TrayIcon::HandleRightClick() {
   if (pimpl_->on_right_click_) {
-    pimpl_->on_right_click_();
+    try {
+      pimpl_->on_right_click_();
+    } catch (...) {
+      // Protect against callback exceptions
+    }
   }
 }
 
 void TrayIcon::HandleDoubleClick() {
   if (pimpl_->on_double_click_) {
-    pimpl_->on_double_click_();
+    try {
+      pimpl_->on_double_click_();
+    } catch (...) {
+      // Protect against callback exceptions
+    }
   }
 }