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-02-03 20:32:15 +01:00
parent 34bb5464bb
commit 7290e41477
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
use core::marker::PhantomData; use core::marker::PhantomData;
#[cfg(feature = "std")]
use os_signals::set_oncrash_ptrs; use os_signals::set_oncrash_ptrs;
use crate::{ use crate::{
@ -18,6 +19,7 @@ use crate::{
#[cfg(unix)] #[cfg(unix)]
use unix_signals as os_signals; use unix_signals as os_signals;
#[cfg(feature = "std")]
use self::os_signals::reset_oncrash_ptrs; use self::os_signals::reset_oncrash_ptrs;
#[cfg(feature = "std")] #[cfg(feature = "std")]
use self::os_signals::setup_crash_handlers; use self::os_signals::setup_crash_handlers;
@ -48,10 +50,10 @@ where
#[inline] #[inline]
fn pre_exec<R, FT, C, EM>( fn pre_exec<R, FT, C, EM>(
&mut self, &mut self,
state: &State<I, R, FT>, _state: &State<I, R, FT>,
corpus: &C, _corpus: &C,
event_mgr: &mut EM, _event_mgr: &mut EM,
input: &I, _input: &I,
) -> Result<(), AflError> ) -> Result<(), AflError>
where where
R: Rand, R: Rand,
@ -60,8 +62,9 @@ where
EM: EventManager<I>, EM: EventManager<I>,
{ {
#[cfg(unix)] #[cfg(unix)]
#[cfg(feature = "std")]
unsafe { unsafe {
set_oncrash_ptrs::<EM, C, OT, FT, I, R>(state, corpus, event_mgr, input); set_oncrash_ptrs::<EM, C, OT, FT, I, R>(_state, _corpus, _event_mgr, _input);
} }
Ok(()) Ok(())
} }
@ -81,6 +84,7 @@ where
EM: EventManager<I>, EM: EventManager<I>,
{ {
#[cfg(unix)] #[cfg(unix)]
#[cfg(feature = "std")]
unsafe { unsafe {
reset_oncrash_ptrs::<EM, C, OT, FT, I, R>(); reset_oncrash_ptrs::<EM, C, OT, FT, I, R>();
} }

4
afl/src/utils.rs
View File

@ -36,11 +36,7 @@ where
SH: ShMem, SH: ShMem,
ST: Stats, ST: Stats,
{ {
println!("state ptr: {:x}", state as *const _ as u64);
println!("state execs: {}", state.executions());
println!("More fun");
let ret_slice = postcard::to_allocvec(&(&state, &corpus, &mgr.describe()?))?; let ret_slice = postcard::to_allocvec(&(&state, &corpus, &mgr.describe()?))?;
println!("done: {:?}", ret_slice);
//let corpus_bytes = serde_json::to_string(&corpus).unwrap(); //let corpus_bytes = serde_json::to_string(&corpus).unwrap();
//println!("fun"); //println!("fun");