Skip to content
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.

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

bump frida version to 16.3.3 #138

Merged
merged 4 commits into from
Jul 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion FRIDA_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.2.5
16.3.3
10 changes: 8 additions & 2 deletions examples/gum/fast_interceptor/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ fn replace_normal() {
let test_func_ptr = test_func as *mut c_void;
let test_detour_ptr = test_detour as *mut c_void;
unsafe {
*ORIGINAL_TEST.lock().unwrap().get_mut() = Some(std::mem::transmute(
*ORIGINAL_TEST.lock().unwrap().get_mut() = Some(std::mem::transmute::<
*mut libc::c_void,
extern "C" fn(*const i8) -> u32,
>(
interceptor
.replace(
NativePointer(test_func_ptr),
Expand All @@ -94,7 +97,10 @@ fn replace_fast() {
let test_func_ptr = test_func as *mut c_void;
let test_detour_ptr = test_detour as *mut c_void;
unsafe {
*ORIGINAL_TEST.lock().unwrap().get_mut() = Some(std::mem::transmute(
*ORIGINAL_TEST.lock().unwrap().get_mut() = Some(std::mem::transmute::<
*mut libc::c_void,
extern "C" fn(*const i8) -> u32,
>(
interceptor
.replace_fast(NativePointer(test_func_ptr), NativePointer(test_detour_ptr))
.unwrap()
Expand Down
5 changes: 4 additions & 1 deletion examples/gum/hook_open/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ fn init() {
let mut interceptor = Interceptor::obtain(&GUM);
let open = Module::find_export_by_name(None, "open").unwrap();
unsafe {
*ORIGINAL_OPEN.lock().unwrap().get_mut() = Some(std::mem::transmute(
*ORIGINAL_OPEN.lock().unwrap().get_mut() = Some(std::mem::transmute::<
*mut libc::c_void,
unsafe extern "C" fn(*const i8, i32) -> i32,
>(
interceptor
.replace(
open,
Expand Down
2 changes: 1 addition & 1 deletion frida-gum-sys/FRIDA_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.2.5
16.3.3
2 changes: 1 addition & 1 deletion frida-sys/FRIDA_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.2.5
16.3.3
5 changes: 4 additions & 1 deletion frida/src/script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ impl<'a> Script<'a> {
pub fn handle_message<I: ScriptHandler>(&self, handler: &mut I) -> Result<()> {
let message = CString::new("message").map_err(|_| Error::CStringFailed)?;
unsafe {
let callback = Some(std::mem::transmute(call_on_message::<I> as *mut c_void));
let callback = Some(std::mem::transmute::<
*mut std::ffi::c_void,
unsafe extern "C" fn(),
>(call_on_message::<I> as *mut c_void));

frida_sys::g_signal_connect_data(
self.script_ptr as _,
Expand Down
Loading