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

Delete useless trait bounds from share_objectives feature (#2908)

Browse Source 
* fix

* a
This commit is contained in:
Dongjia "toka" Zhang 2025-01-29 13:55:38 +01:00 committed by GitHub
parent 5002336fad
commit fd6271fa35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libafl/src/events/llmp/mod.rs
View File

@ -14,8 +14,6 @@ use libafl_bolts::{
}; };
use serde::{de::DeserializeOwned, Serialize}; use serde::{de::DeserializeOwned, Serialize};
#[cfg(feature = "share_objectives")]
use crate::corpus::{Corpus, Testcase};
use crate::{ use crate::{
events::{Event, EventFirer}, events::{Event, EventFirer},
fuzzer::EvaluatorObservers, fuzzer::EvaluatorObservers,
@ -262,7 +260,6 @@ where
) -> Result<(), Error> ) -> Result<(), Error>
where where
ICB: InputConverter<To = I, From = DI>, ICB: InputConverter<To = I, From = DI>,
S: HasCurrentTestcase<I> + HasSolutions<I>,
Z: EvaluatorObservers<E, EM, I, S>, Z: EvaluatorObservers<E, EM, I, S>,
{ {
match event { match event {
@ -297,17 +294,17 @@ where
return Ok(()); return Ok(());
}; };
let converted_input = converter.convert(input)?; let res = fuzzer.evaluate_input_with_observers(
let mut testcase = Testcase::from(converted_input); state,
testcase.set_parent_id_optional(*state.corpus().current()); executor,
manager,
converter.convert(input)?,
false,
)?;
if let Ok(mut tc) = state.current_testcase_mut() { if let Some(item) = res.1 {
tc.found_objective(); log::info!("Added received Objective as item #{item}");
} }
state.solutions_mut().add(testcase)?;
log::info!("Added received Objective to Corpus");
Ok(()) Ok(())
} }
Event::Stop => Ok(()), Event::Stop => Ok(()),

21
libafl/src/events/llmp/restarting.rs
View File

@ -47,8 +47,6 @@ use libafl_bolts::{
use serde::{de::DeserializeOwned, Serialize}; use serde::{de::DeserializeOwned, Serialize};
use typed_builder::TypedBuilder; use typed_builder::TypedBuilder;
#[cfg(feature = "share_objectives")]
use crate::corpus::{Corpus, Testcase};
#[cfg(feature = "llmp_compression")] #[cfg(feature = "llmp_compression")]
use crate::events::COMPRESS_THRESHOLD; use crate::events::COMPRESS_THRESHOLD;
#[cfg(all(unix, not(miri)))] #[cfg(all(unix, not(miri)))]
@ -575,7 +573,7 @@ where
event: Event<I>, event: Event<I>,
) -> Result<(), Error> ) -> Result<(), Error>
where where
S: HasImported + HasSolutions<I> + HasCurrentTestcase<I> + Stoppable, S: HasImported + Stoppable,
EMH: EventManagerHooksTuple<I, S>, EMH: EventManagerHooksTuple<I, S>,
I: Input, I: Input,
E: HasObservers, E: HasObservers,
@ -623,16 +621,17 @@ where
#[cfg(feature = "share_objectives")] #[cfg(feature = "share_objectives")]
Event::Objective { input, .. } => { Event::Objective { input, .. } => {
log::debug!("Received new Objective"); #[cfg(feature = "std")]
let mut testcase = Testcase::from(input); log::debug!("[{}] Received new Objective", std::process::id());
testcase.set_parent_id_optional(*state.corpus().current());
if let Ok(mut tc) = state.current_testcase_mut() { let res =
tc.found_objective(); fuzzer.evaluate_input_with_observers(state, executor, self, input, false)?;
if let Some(item) = res.1 {
*state.imported_mut() += 1;
log::debug!("Added received Objective {evt_name} as item #{item}");
} else {
log::debug!("Objective {evt_name} was discarded");
} }
state.solutions_mut().add(testcase)?;
log::info!("Added received Objective to Corpus");
} }
Event::Stop => { Event::Stop => {
state.request_stop(); state.request_stop();

23
libafl/src/events/tcp.rs
View File

@ -39,8 +39,6 @@ use tokio::{
use typed_builder::TypedBuilder; use typed_builder::TypedBuilder;
use super::{std_maybe_report_progress, std_report_progress, AwaitRestartSafe, SendExiting}; use super::{std_maybe_report_progress, std_report_progress, AwaitRestartSafe, SendExiting};
#[cfg(feature = "share_objectives")]
use crate::corpus::{Corpus, Testcase};
#[cfg(all(unix, not(miri)))] #[cfg(all(unix, not(miri)))]
use crate::events::EVENTMGR_SIGHANDLER_STATE; use crate::events::EVENTMGR_SIGHANDLER_STATE;
use crate::{ use crate::{
@ -565,12 +563,7 @@ impl<EMH, I, S> Drop for TcpEventManager<EMH, I, S> {
impl<EMH, I, S> TcpEventManager<EMH, I, S> impl<EMH, I, S> TcpEventManager<EMH, I, S>
where where
EMH: EventManagerHooksTuple<I, S>, EMH: EventManagerHooksTuple<I, S>,
S: HasExecutions S: HasExecutions + HasMetadata + HasImported + Stoppable,
+ HasMetadata
+ HasImported
+ HasSolutions<I>
+ HasCurrentTestcase<I>
+ Stoppable,
{ {
/// Write the client id for a client `EventManager` to env vars /// Write the client id for a client `EventManager` to env vars
pub fn to_env(&self, env_name: &str) { pub fn to_env(&self, env_name: &str) {
@ -623,16 +616,14 @@ where
#[cfg(feature = "share_objectives")] #[cfg(feature = "share_objectives")]
Event::Objective { input, .. } => { Event::Objective { input, .. } => {
log::debug!("Received new Objective"); log::info!("Received new Objective");
let mut testcase = Testcase::from(input);
testcase.set_parent_id_optional(*state.corpus().current());
if let Ok(mut tc) = state.current_testcase_mut() { let res =
tc.found_objective(); fuzzer.evaluate_input_with_observers(state, executor, self, input, false)?;
if let Some(item) = res.1 {
*state.imported_mut() += 1;
log::info!("Added received Testcase as item #{item}");
} }
state.solutions_mut().add(testcase)?;
log::info!("Added received Objective to Corpus");
} }
Event::Stop => { Event::Stop => {
state.request_stop(); state.request_stop();