lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rust only add mmio callback funktion, if callback is requested

Browse Source 
The C function uc_mmio_map() allows to add seperate callback functions
and userdata for read and write. When the callback functions are NULL
unicorn don't try to call this functions.

Previous this patch, when i.e. read_callback was None the callback was set
to mmio_read_callback_proxy and the userdata was set to NULL. On a callback
the mmio_read_callback_proxy then tried to dereference the userdata and
caused a segfault.

fixes #1762
This commit is contained in:
Takacs, Philipp
2023-01-23 13:22:55 +01:00
parent 549f34f098
commit ed9164e47a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bindings/rust/src/lib.rs
View File

@@ -388,12 +388,18 @@ impl<'a, D> Unicorn<'a, D> {
self.get_handle(), self.get_handle(),
address, address,
size, size,
ffi::mmio_read_callback_proxy::<D, R> as _, match read_data {
Some(_) => ffi::mmio_read_callback_proxy::<D, R> as _,
None => ptr::null_mut(),
},
match read_data { match read_data {
Some(ref mut d) => d.as_mut() as *mut _ as _, Some(ref mut d) => d.as_mut() as *mut _ as _,
None => ptr::null_mut(), None => ptr::null_mut(),
}, },
ffi::mmio_write_callback_proxy::<D, W> as _, match write_data {
Some(_) => ffi::mmio_write_callback_proxy::<D, W> as _,
None => ptr::null_mut(),
},
match write_data { match write_data {
Some(ref mut d) => d.as_mut() as *mut _ as _, Some(ref mut d) => d.as_mut() as *mut _ as _,
None => ptr::null_mut(), None => ptr::null_mut(),