SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for win32

Browse Source
This commit is contained in:
Andrea Fioraldi 2021-03-18 16:26:03 +01:00
parent 5604f3d826
commit 147a6c53b8
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libafl/src/bolts/os/windows_exceptions.rs
View File

@ -217,7 +217,7 @@ pub unsafe fn setup_exception_handler<T: 'static + Handler>(handler: &mut T) ->
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
unsafe { unsafe {
if let Some(prev) = SetUnhandledExceptionFilter(Some(core::mem::transmute(handle_exception as as *const c_void))) { if let Some(prev) = SetUnhandledExceptionFilter(Some(core::mem::transmute(handle_exception as *const c_void))) {
PREVIOUS_HANDLER = Some(core::mem::transmute(prev as *const c_void)); PREVIOUS_HANDLER = Some(core::mem::transmute(prev as *const c_void));
} }
} }

30
libafl/src/bolts/shmem.rs
View File

@ -500,7 +500,7 @@ pub mod shmem {
impl Drop for Win32ShMem { impl Drop for Win32ShMem {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
UnmapViewOfFile(self.map as *const c_void); UnmapViewOfFile(self.map as *mut c_void as *const c_void);
CloseHandle(self.handle); CloseHandle(self.handle);
} }
} }
@ -524,18 +524,18 @@ pub mod shmem {
String::from_utf8_lossy(map_str_bytes) String::from_utf8_lossy(map_str_bytes)
))); )));
} }
Ok(Self {
shm_str: map_str_bytes.clone(),
handle: handle,
map: map,
map_size: map_size,
})
} }
Ok(Self {
shm_str: map_str_bytes.clone(),
handle: handle,
map: map,
map_size: map_size,
})
} }
pub fn new(map_size: usize) -> Result<Self, Error> { pub fn new(map_size: usize) -> Result<Self, Error> {
let uuid = Uuid::new_v4(); let uuid = Uuid::new_v4();
let mut map_str_bytes = format!("libafl_{}", uuid.to_simple()).as_mut_bytes(); let mut map_str_bytes = format!("libafl_{}", uuid.to_simple()).as_mut_vec();
map_str_bytes[19] = 0; // Trucate to size 20 map_str_bytes[19] = 0; // Trucate to size 20
unsafe { unsafe {
let handle = CreateFileMappingA( let handle = CreateFileMappingA(
@ -544,7 +544,7 @@ pub mod shmem {
PAGE_READWRITE, PAGE_READWRITE,
0, 0,
map_size as u32, map_size as u32,
map_str_bytes as *const u8 as *const i8, map_str_bytes.as_ptr() as *const i8,
); );
if handle == HANDLE(0) { if handle == HANDLE(0) {
return Err(Error::Unknown(format!( return Err(Error::Unknown(format!(
@ -560,13 +560,13 @@ pub mod shmem {
String::from_utf8_lossy(map_str_bytes) String::from_utf8_lossy(map_str_bytes)
))); )));
} }
Ok(Self {
shm_str: map_str_bytes[0..20].clone(),
handle: handle,
map: map,
map_size: map_size,
})
} }
Ok(Self {
shm_str: map_str_bytes[0..20].clone(),
handle: handle,
map: map,
map_size: map_size,
})
} }
} }
} }