From c5d8b7fc6268aa6e364b8d6e934296dade348ef2 Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Thu, 18 Mar 2021 16:41:10 +0100 Subject: [PATCH] fixes for win32 --- libafl/src/bolts/os/windows_exceptions.rs | 1 - libafl/src/bolts/shmem.rs | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libafl/src/bolts/os/windows_exceptions.rs b/libafl/src/bolts/os/windows_exceptions.rs index 10b022b5d1..f54ebcc83c 100644 --- a/libafl/src/bolts/os/windows_exceptions.rs +++ b/libafl/src/bolts/os/windows_exceptions.rs @@ -8,7 +8,6 @@ use core::{ cell::UnsafeCell, convert::TryFrom, fmt::{self, Display, Formatter}, - mem, ptr, ptr::write_volatile, sync::atomic::{compiler_fence, Ordering}, }; diff --git a/libafl/src/bolts/shmem.rs b/libafl/src/bolts/shmem.rs index 088a5c7cca..d1bceec7c7 100644 --- a/libafl/src/bolts/shmem.rs +++ b/libafl/src/bolts/shmem.rs @@ -455,7 +455,7 @@ pub mod shmem { Error, }; - use core::ffi::c_void; + use core::{ptr, slice, ffi::c_void}; use uuid::Uuid; const INVALID_HANDLE_VALUE: isize = -1; @@ -511,7 +511,7 @@ pub mod shmem { let handle = OpenFileMappingA( FILE_MAP_ALL_ACCESS, BOOL(0), - PSTR(map_str_bytes as *const u8), + PSTR(map_str_bytes as *const u8 as *mut u8), ); if handle == HANDLE(0) { return Err(Error::Unknown(format!( @@ -549,7 +549,7 @@ pub mod shmem { PAGE_TYPE::PAGE_READWRITE, 0, map_size as u32, - PSTR(map_str_bytes.as_ptr()), + PSTR(map_str_bytes.as_mut()), ); if handle == HANDLE(0) { return Err(Error::Unknown(format!(