Skip to content

Fix access violation in Handler #240

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

Closed
Xoffio wants to merge 1 commit into from
Closed

Fix access violation in Handler #240

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
10 changes: 7 additions & 3 deletions frida/src/script.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ pub enum MessageLogLevel {
Error,
}

unsafe extern "C" fn call_on_message<I: ScriptHandler>(
unsafe extern "C" fn call_on_message(
_script_ptr: *mut _FridaScript,
message: *const i8,
data: *const frida_sys::_GBytes,
Expand All @@ -106,7 +106,11 @@ unsafe extern "C" fn call_on_message<I: ScriptHandler>(
on_message(callback_handler.as_mut().unwrap(), formatted_msg);
}
_ => {
let handler: &mut I = &mut *(user_data as *mut I);
let callback_handler: &mut CallbackHandler = &mut *(user_data as *mut CallbackHandler);
let handler = match callback_handler.script_handler.as_mut() {
Some(h) => h,
None => return,
};

// Retrieve extra message data, if any.
if data.is_null() {
Expand Down Expand Up @@ -239,7 +243,7 @@ impl<'a> Script<'a> {
let callback = Some(std::mem::transmute::<
*mut std::ffi::c_void,
unsafe extern "C" fn(),
>(call_on_message::<I> as *mut c_void));
>(call_on_message as *mut c_void));

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