Fix wkwebview crashed when received invalid UTF8 string from IPC (#1084)

tauri-apps · Nov 20, 2023 · 5c57d42 · 5c57d42
1 parent 8790786
commit 5c57d42
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changes/fix-expect.md b/.changes/fix-expect.md
@@ -0,0 +1,6 @@
+---
+"wry": patch
+---
+
+Fix wkwebview crashed when received invalid UTF8 string from IPC. 
+
diff --git a/src/webview/wkwebview/mod.rs b/src/webview/wkwebview/mod.rs
@@ -99,9 +99,11 @@ impl InnerWebView {
             &mut *(*function as *mut (Box<dyn for<'r> Fn(&'r Window, String)>, Rc<Window>));
           let body: id = msg_send![msg, body];
           let utf8: *const c_char = msg_send![body, UTF8String];
-          let js = CStr::from_ptr(utf8).to_str().expect("Invalid UTF8 string");
-
-          (function.0)(&function.1, js.to_string());
+          if let Ok(js) = CStr::from_ptr(utf8).to_str() {
+            (function.0)(&function.1, js.to_string());
+          } else {
+            log::warn!("WebView received invalid UTF8 string from IPC.");
+          }
         } else {
           log::warn!("WebView instance is dropped! This handler shouldn't be called.");
         }