Skip to content

fix(macos): avoid panicking on missing webview URL #1729

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

Open
gilgtm wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(macos): avoid panicking on missing webview URL #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changes/macos-webview-url-error.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"wry": patch
---

Return an error instead of panicking when `WebView::url` cannot read a URL from `WKWebView` on macOS and iOS.
12 changes: 10 additions & 2 deletions src/wkwebview/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,8 +1346,16 @@ r#"Object.defineProperty(window, 'ipc', {
}

pub fn url_from_webview(webview: &WKWebView) -> Result<String> {
let url_obj = unsafe { webview.URL().unwrap() };
let absolute_url = unsafe { url_obj.absoluteString().unwrap() };
let Some(url_obj) = (unsafe { webview.URL() }) else {
return Err(Error::Io(std::io::Error::other(
"failed to get WebView URL",
)));
};
let Some(absolute_url) = (unsafe { url_obj.absoluteString() }) else {
return Err(Error::Io(std::io::Error::other(
"failed to get absolute WebView URL",
)));
};

let bytes = {
let bytes: *const c_char = absolute_url.UTF8String();
Expand Down
Loading