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

no_std fixes

Browse Source
This commit is contained in:
Dominik Maier 2021-01-05 01:02:20 +01:00
parent 15fc19decf
commit abe027ad95
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
afl/src/executors/inmemory.rs
View File

@ -1,4 +1,4 @@
use alloc::boxed::Box; use alloc::{boxed::Box, string::ToString, vec::Vec};
use core::{ffi::c_void, ptr}; use core::{ffi::c_void, ptr};
use crate::{ use crate::{
@ -14,6 +14,7 @@ use crate::{
AflError, AflError,
}; };
#[cfg(feature = "std")]
use self::unix_signals::setup_crash_handlers; use self::unix_signals::setup_crash_handlers;
/// The (unsafe) pointer to the current inmem input, for the current run. /// The (unsafe) pointer to the current inmem input, for the current run.
@ -93,6 +94,8 @@ where
OT: ObserversTuple, OT: ObserversTuple,
{ {
/// Create a new in mem executor. /// Create a new in mem executor.
/// Caution: crash and restart in one of them will lead to odd behavior if multiple are used,
/// depnding on different corpus or state.
/// * `name` - the name of this executor (to address it along the way) /// * `name` - the name of this executor (to address it along the way)
/// * `harness_fn` - the harness, executiong the function /// * `harness_fn` - the harness, executiong the function
/// * `on_crash_fn` - When an in-mem harness crashes, it may safe some state to continue fuzzing later. /// * `on_crash_fn` - When an in-mem harness crashes, it may safe some state to continue fuzzing later.
@ -103,9 +106,9 @@ where
harness_fn: HarnessFunction<I>, harness_fn: HarnessFunction<I>,
observers: OT, observers: OT,
on_crash_fn: Box<dyn FnMut(ExitKind, &[u8])>, on_crash_fn: Box<dyn FnMut(ExitKind, &[u8])>,
state: &State<I, R, FT, OT>, _state: &State<I, R, FT, OT>,
corpus: &C, _corpus: &C,
event_manager: &mut EM, _event_manager: &mut EM,
) -> Self ) -> Self
where where
C: Corpus<I, R>, C: Corpus<I, R>,
@ -114,11 +117,12 @@ where
FT: FeedbacksTuple<I>, FT: FeedbacksTuple<I>,
R: Rand, R: Rand,
{ {
#[cfg(feature = "std")]
unsafe { unsafe {
CORPUS_PTR = corpus as *const _ as *const c_void; CORPUS_PTR = _corpus as *const _ as *const c_void;
STATE_PTR = state as *const _ as *const c_void; STATE_PTR = _state as *const _ as *const c_void;
setup_crash_handlers(event_manager); setup_crash_handlers(_event_manager);
} }
Self { Self {
@ -365,11 +369,13 @@ mod tests {
#[test] #[test]
fn test_inmem_exec() { fn test_inmem_exec() {
/* let mut in_mem_executor = InMemoryExecutor {
let mut in_mem_executor = harness: test_harness_fn_nop,
InMemoryExecutor::new("main", test_harness_fn_nop, tuple_list!(), Box::new(|_| ())); on_crash_fn: Box::new(|_, _| ()),
observers: tuple_list!(),
name: "main",
};
let mut input = NopInput {}; let mut input = NopInput {};
assert!(in_mem_executor.run_target(&mut input).is_ok()); assert!(in_mem_executor.run_target(&mut input).is_ok());
*/
} }
} }