Merge branch 'frida:main' into main

Author: b1ueb1ues

examples/core/console_log/src/main.rs

@@ -46,7 +46,7 @@ fn main() {
 struct Handler;
 
 impl ScriptHandler for Handler {
-    fn on_message(&mut self, message: &frida::Message, _data: Option<Vec<u8>>) {
+    fn on_message(&mut self, message: frida::Message, _data: Option<Vec<u8>>) {
         println!("{:?}", message);
     }
 }

examples/core/list_exports/src/main.rs

@@ -74,7 +74,7 @@ fn main() {
 struct Handler;
 
 impl frida::ScriptHandler for Handler {
-    fn on_message(&mut self, message: &Message, _data: Option<Vec<u8>>) {
+    fn on_message(&mut self, message: Message, _data: Option<Vec<u8>>) {
         println!("- {:?}", message);
     }
 }

examples/core/rpc_execute_function/src/main.rs

@@ -111,7 +111,7 @@ fn main() {
 struct Handler;
 
 impl frida::ScriptHandler for Handler {
-    fn on_message(&mut self, message: &Message, _data: Option<Vec<u8>>) {
+    fn on_message(&mut self, message: Message, _data: Option<Vec<u8>>) {
         println!("- {:?}", message);
     }
 }

frida-gum/src/backtracer.rs

@@ -12,15 +12,22 @@ use {core::mem::MaybeUninit, frida_gum_sys as gum_sys};
 
 // The following function is not exposed through the `frida-gum.h` header, so we don't have an
 // auto-generated binding for it. This may change in a future version.
-#[cfg(not(target_os = "windows"))]
 extern "C" {
     // On some platforms `ucontext` contains a u128 which does not have a defined ABI. In this case,
     // we disable the error as we assume the behaviour is correct (all other platforms are unaffected).
+    #[cfg(target_os = "linux")]
     #[allow(improper_ctypes)]
     fn gum_linux_parse_ucontext(
         context: *const libc::ucontext_t,
         cpu_context: *mut gum_sys::GumCpuContext,
     );
+
+    #[cfg(target_os = "freebsd")]
+    #[allow(improper_ctypes)]
+    fn gum_freebsd_parse_ucontext(
+        context: *const libc::ucontext_t,
+        cpu_context: *mut gum_sys::GumCpuContext,
+    );
 }
 
 pub struct Backtracer;
@@ -84,24 +91,36 @@ impl Backtracer {
 
     /// Generate an accurate backtrace as a list of return addresses for the supplied signal
     /// context.
-    #[cfg(not(target_os = "windows"))]
+    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     pub fn accurate_with_signal_context(context: &libc::ucontext_t) -> Vec<usize> {
         let mut cpu_context = MaybeUninit::<gum_sys::GumCpuContext>::uninit();
 
         unsafe {
+            #[cfg(target_os = "linux")]
             gum_linux_parse_ucontext(context as *const libc::ucontext_t, cpu_context.as_mut_ptr());
+            #[cfg(target_os = "freebsd")]
+            gum_freebsd_parse_ucontext(
+                context as *const libc::ucontext_t,
+                cpu_context.as_mut_ptr(),
+            );
             Self::accurate_with_context(&cpu_context.assume_init())
         }
     }
 
     /// Generate a fuzzy backtrace as a list of return addresses for the supplied signal
     /// context.
-    #[cfg(not(target_os = "windows"))]
+    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
     pub fn fuzzy_with_signal_context(context: &libc::ucontext_t) -> Vec<usize> {
         let mut cpu_context = MaybeUninit::<gum_sys::GumCpuContext>::uninit();
 
         unsafe {
+            #[cfg(target_os = "linux")]
             gum_linux_parse_ucontext(context as *const libc::ucontext_t, cpu_context.as_mut_ptr());
+            #[cfg(target_os = "freebsd")]
+            gum_freebsd_parse_ucontext(
+                context as *const libc::ucontext_t,
+                cpu_context.as_mut_ptr(),
+            );
             Self::fuzzy_with_context(&cpu_context.assume_init())
         }
     }

frida-gum/src/process.rs

@@ -20,14 +20,14 @@ use alloc::{string::String, string::ToString, vec::Vec};
 use cstr_core::CString;
 use frida_gum_sys::GumThreadFlags_GUM_THREAD_FLAGS_ALL;
 
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
 extern "C" {
     pub fn _frida_g_get_home_dir() -> *const c_char;
     pub fn _frida_g_get_current_dir() -> *const c_char;
     pub fn _frida_g_get_tmp_dir() -> *const c_char;
 }
 
-#[cfg(not(target_os = "linux"))]
+#[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
 extern "C" {
     pub fn g_get_home_dir() -> *const c_char;
     pub fn g_get_current_dir() -> *const c_char;
@@ -130,9 +130,9 @@ impl<'a> Process<'a> {
     /// Returns a string specifying the filesystem path to the current working directory
     pub fn current_dir(&self) -> String {
         unsafe {
-            #[cfg(target_os = "linux")]
+            #[cfg(any(target_os = "linux", target_os = "freebsd"))]
             let dir = _frida_g_get_current_dir();
-            #[cfg(not(target_os = "linux"))]
+            #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
             let dir = g_get_current_dir();
 
             CStr::from_ptr(dir).to_string_lossy().to_string()
@@ -142,9 +142,9 @@ impl<'a> Process<'a> {
     /// Returns a string specifying the filesystem path to the directory to use for temporary files
     pub fn tmp_dir(&self) -> String {
         unsafe {
-            #[cfg(target_os = "linux")]
+            #[cfg(any(target_os = "linux", target_os = "freebsd"))]
             let dir = _frida_g_get_tmp_dir();
-            #[cfg(not(target_os = "linux"))]
+            #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
             let dir = g_get_tmp_dir();
 
             CStr::from_ptr(dir).to_string_lossy().to_string()
@@ -154,9 +154,9 @@ impl<'a> Process<'a> {
     /// Returns a string specifying the filesystem path to the current user’s home directory
     pub fn home_dir(&self) -> String {
         unsafe {
-            #[cfg(target_os = "linux")]
+            #[cfg(any(target_os = "linux", target_os = "freebsd"))]
             let dir = _frida_g_get_home_dir();
-            #[cfg(not(target_os = "linux"))]
+            #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
             let dir = g_get_home_dir();
 
             CStr::from_ptr(dir).to_string_lossy().to_string()

frida-gum/src/script/context.rs

@@ -3,15 +3,15 @@ use {
     frida_gum_sys::{GMainContext, GMainLoop},
 };
 
-#[cfg(any(target_os = "linux", target_os = "android"))]
+#[cfg(any(target_os = "linux", target_os = "android", target_os = "freebsd"))]
 use frida_gum_sys::{
     _frida_g_main_context_iteration as g_main_context_iteration,
     _frida_g_main_context_pending as g_main_context_pending,
     _frida_g_main_context_push_thread_default as g_main_context_push_thread_default,
     _frida_g_main_loop_new as g_main_loop_new,
 };
 
-#[cfg(not(any(target_os = "linux", target_os = "android")))]
+#[cfg(not(any(target_os = "linux", target_os = "android", target_os = "freebsd")))]
 use frida_gum_sys::{
     g_main_context_iteration, g_main_context_pending, g_main_context_push_thread_default,
     g_main_loop_new,

frida-gum/src/script/data.rs

@@ -13,10 +13,10 @@ use {
 };
 
 /* glib exports are aliased in frida devkit for Linux and Android */
-#[cfg(any(target_os = "linux", target_os = "android"))]
+#[cfg(any(target_os = "linux", target_os = "android", target_os = "freebsd"))]
 use frida_gum_sys::_frida_g_bytes_get_data as g_bytes_get_data;
 
-#[cfg(not(any(target_os = "linux", target_os = "android")))]
+#[cfg(not(any(target_os = "linux", target_os = "android", target_os = "freebsd")))]
 use frida_gum_sys::g_bytes_get_data;
 
 pub(crate) struct ScriptData<F>

frida/src/script.rs

@@ -121,7 +121,7 @@ unsafe extern "C" fn call_on_message<I: ScriptHandler>(
 
             // Retrieve extra message data, if any.
             if data.is_null() {
-                handler.on_message(&formatted_msg, None);
+                handler.on_message(formatted_msg, None);
                 return;
             }
 
@@ -140,7 +140,7 @@ unsafe extern "C" fn call_on_message<I: ScriptHandler>(
                         .to_vec(),
                 )
             };
-            handler.on_message(&formatted_msg, data_vec);
+            handler.on_message(formatted_msg, data_vec);
         }
     }
 }
@@ -153,7 +153,7 @@ fn on_message(cb_handler: &mut CallbackHandler, message: Message) {
 /// Represents a script signal handler.
 pub trait ScriptHandler {
     /// Handler called when a message is shared from JavaScript to Rust.
-    fn on_message(&mut self, message: &Message, data: Option<Vec<u8>>);
+    fn on_message(&mut self, message: Message, data: Option<Vec<u8>>);
 }
 
 /// Represents a Frida script.
@@ -234,7 +234,7 @@ impl<'a> Script<'a> {
     /// struct Handler;
     ///
     /// impl ScriptHandler for Handler {
-    ///     fn on_message(&mut self, message: &frida::Message, data: Option<Vec<u8>>) {
+    ///     fn on_message(&mut self, message: frida::Message, data: Option<Vec<u8>>) {
     ///         println!("Message: {:?}", message);
     ///         println!("Data: {:?}", data);
     ///     }