Merge branch 'windows' of github.com:AFLplusplus/LibAFL into windows
This commit is contained in:
commit
6840016f7d
@ -1,9 +1,6 @@
|
||||
pub use crate::bolts::bindings::windows::win32::debug::EXCEPTION_POINTERS;
|
||||
|
||||
use crate::{
|
||||
bolts::bindings::windows::win32::debug::{SetUnhandledExceptionFilter},
|
||||
Error,
|
||||
};
|
||||
use crate::{bolts::bindings::windows::win32::debug::SetUnhandledExceptionFilter, Error};
|
||||
|
||||
use alloc::vec::Vec;
|
||||
use core::{
|
||||
|
@ -455,7 +455,7 @@ pub mod shmem {
|
||||
Error,
|
||||
};
|
||||
|
||||
use core::{ptr, slice, ffi::c_void};
|
||||
use core::{ffi::c_void, ptr, slice};
|
||||
use uuid::Uuid;
|
||||
|
||||
const INVALID_HANDLE_VALUE: isize = -1;
|
||||
|
@ -2,10 +2,10 @@
|
||||
//! It should usually be paired with extra error-handling, such as a restarting event manager, to be effective.
|
||||
|
||||
use core::{
|
||||
ffi::c_void,
|
||||
marker::PhantomData,
|
||||
ptr::{self, write_volatile},
|
||||
sync::atomic::{compiler_fence, Ordering},
|
||||
ffi::c_void,
|
||||
marker::PhantomData
|
||||
};
|
||||
|
||||
#[cfg(unix)]
|
||||
@ -124,7 +124,6 @@ where
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl<I, OT> Named for InProcessExecutor<I, OT>
|
||||
@ -466,16 +465,16 @@ mod unix_signal_handler {
|
||||
#[cfg(windows)]
|
||||
mod windows_exception_handler {
|
||||
use alloc::vec::Vec;
|
||||
use core::{ptr, ffi::c_void};
|
||||
use core::{ffi::c_void, ptr};
|
||||
#[cfg(feature = "std")]
|
||||
use std::{
|
||||
io::{stdout, Write},
|
||||
};
|
||||
use std::io::{stdout, Write};
|
||||
|
||||
use crate::{
|
||||
bolts::{
|
||||
os::windows_exceptions::{Handler, ExceptionCode, EXCEPTION_POINTERS, CRASH_EXCEPTIONS},
|
||||
bindings::windows::win32::system_services::ExitProcess
|
||||
bindings::windows::win32::system_services::ExitProcess,
|
||||
os::windows_exceptions::{
|
||||
ExceptionCode, Handler, CRASH_EXCEPTIONS, EXCEPTION_POINTERS,
|
||||
},
|
||||
},
|
||||
corpus::{Corpus, Testcase},
|
||||
events::{Event, EventManager},
|
||||
@ -517,7 +516,7 @@ mod windows_exception_handler {
|
||||
unsafe fn nop_handler(
|
||||
_code: ExceptionCode,
|
||||
_exception_pointers: *mut EXCEPTION_POINTERS,
|
||||
_data: &mut InProcessExecutorHandlerData
|
||||
_data: &mut InProcessExecutorHandlerData,
|
||||
) {
|
||||
}
|
||||
|
||||
@ -596,10 +595,12 @@ mod windows_exception_handler {
|
||||
{
|
||||
println!("Double crash\n");
|
||||
let crash_addr = exception_pointers
|
||||
.as_mut()
|
||||
.unwrap()
|
||||
.exception_record.as_mut()
|
||||
.unwrap().exception_address as usize;
|
||||
.as_mut()
|
||||
.unwrap()
|
||||
.exception_record
|
||||
.as_mut()
|
||||
.unwrap()
|
||||
.exception_address as usize;
|
||||
|
||||
println!(
|
||||
"We crashed at addr 0x{:x}, but are not in the target... Bug in the fuzzer? Exiting.",
|
||||
|
@ -96,7 +96,12 @@ where
|
||||
|
||||
/// Called right after execution finished.
|
||||
#[inline]
|
||||
fn post_exec<EM, S>(&mut self, _state: &mut S, _event_mgr: &mut EM, _input: &I) -> Result<(), Error>
|
||||
fn post_exec<EM, S>(
|
||||
&mut self,
|
||||
_state: &mut S,
|
||||
_event_mgr: &mut EM,
|
||||
_input: &I,
|
||||
) -> Result<(), Error>
|
||||
where
|
||||
EM: EventManager<I, S>,
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user