Skip to content

fix(tauri-runtime-wry): stop leaking ObjC retains in with_webview #15224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Legend-Master merged 6 commits into from
Jul 9, 2026
Merged

fix(tauri-runtime-wry): stop leaking ObjC retains in with_webview #15224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af09850
tauri-runtime-wry: avoid leaking ObjC retains in with_webview
krishpranav Apr 11, 2026
b3f13c8
chore: add changes file for #15210
krishpranav Apr 11, 2026
9e7a52f
changes: fix covector metadata for objc leak patch
krishpranav Apr 11, 2026
7bc0dc5
chore(tauri-runtime-wry): document Apple Webview pointer fields
krishpranav Jul 9, 2026
9c3ef2d
refactor(tauri-runtime-wry): simplify pointer cast in with_webview
krishpranav Jul 9, 2026
a7d3363
Add tauri in change file so it shows up there
Legend-Master Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/fix-objc-retain-leak.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri": patch:bug
"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.
22 changes: 10 additions & 12 deletions crates/tauri-runtime-wry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3903,26 +3903,24 @@ fn handle_user_message<T: UserEvent>(
#[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
as *mut std::ffi::c_void,
manager: Retained::into_raw(webview.manager()) as *mut objc2::runtime::AnyObject
as *mut std::ffi::c_void,
ns_window: Retained::into_raw(webview.ns_window()) as *mut objc2::runtime::AnyObject
as *mut std::ffi::c_void,
webview: Retained::as_ptr(&platform_webview).cast_mut() as *mut std::ffi::c_void,
manager: Retained::as_ptr(&manager).cast_mut() as *mut std::ffi::c_void,
ns_window: Retained::as_ptr(&ns_window).cast_mut() 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
as *mut std::ffi::c_void,
manager: Retained::into_raw(webview.inner.manager())
as *mut objc2::runtime::AnyObject
as *mut std::ffi::c_void,
webview: Retained::as_ptr(&platform_webview).cast_mut() as *mut std::ffi::c_void,
manager: Retained::as_ptr(&manager).cast_mut() as *mut std::ffi::c_void,
view_controller: window.ui_view_controller(),
});
}
Expand Down
2 changes: 2 additions & 0 deletions crates/tauri-runtime-wry/src/webview.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ mod imp {
mod imp {
use std::ffi::c_void;

// These pointers are borrowed from ObjC `Retained` handles owned elsewhere and must
// not be mutated through. TODO: change these to `*const c_void` in v3 (breaking change).
pub struct Webview {
pub webview: *mut c_void,
pub manager: *mut c_void,
Expand Down