diff --git a/.changes/fix-objc-retain-leak.md b/.changes/fix-objc-retain-leak.md new file mode 100644 index 000000000000..0c4951ab1db7 --- /dev/null +++ b/.changes/fix-objc-retain-leak.md @@ -0,0 +1,5 @@ +--- +"tauri-runtime-wry": patch:bug +--- + +Avoid leaking Objective-C objects in `WebviewMessage::WithWebview` on Apple targets by replacing `Retained::into_raw` with scoped retained bindings and `Retained::as_ptr` pointer handoff. diff --git a/crates/tauri-runtime-wry/src/lib.rs b/crates/tauri-runtime-wry/src/lib.rs index 772c392a2632..f50f58ff4068 100644 --- a/crates/tauri-runtime-wry/src/lib.rs +++ b/crates/tauri-runtime-wry/src/lib.rs @@ -3990,25 +3990,28 @@ fn handle_user_message( #[cfg(target_os = "macos")] { use wry::WebViewExtMacOS; + let platform_webview = webview.webview(); + let manager = webview.manager(); + let ns_window = webview.ns_window(); f(Webview { - webview: Retained::into_raw(webview.webview()) as *mut objc2::runtime::AnyObject + webview: Retained::as_ptr(&platform_webview) as *const std::ffi::c_void as *mut std::ffi::c_void, - manager: Retained::into_raw(webview.manager()) as *mut objc2::runtime::AnyObject + manager: Retained::as_ptr(&manager) as *const std::ffi::c_void as *mut std::ffi::c_void, - ns_window: Retained::into_raw(webview.ns_window()) as *mut objc2::runtime::AnyObject + ns_window: Retained::as_ptr(&ns_window) as *const std::ffi::c_void as *mut std::ffi::c_void, }); } #[cfg(target_os = "ios")] { use wry::WebViewExtIOS; + let platform_webview = webview.inner.webview(); + let manager = webview.inner.manager(); f(Webview { - webview: Retained::into_raw(webview.inner.webview()) - as *mut objc2::runtime::AnyObject + webview: Retained::as_ptr(&platform_webview) as *const std::ffi::c_void as *mut std::ffi::c_void, - manager: Retained::into_raw(webview.inner.manager()) - as *mut objc2::runtime::AnyObject + manager: Retained::as_ptr(&manager) as *const std::ffi::c_void as *mut std::ffi::c_void, view_controller: window.ui_view_controller(), });