fixup libafl_libfuzzer

Author: addisoncrump

libafl_libfuzzer/libafl_libfuzzer_runtime/src/feedbacks.rs

@@ -170,4 +170,4 @@ where
     }
 }
 
-pub type ShrinkMapFeedback<O, S, T> = MinMapFeedback<MappedEdgeMapObserver<O, T>, S, usize>;
+pub type ShrinkMapFeedback<O, S, T, A> = MinMapFeedback<MappedEdgeMapObserver<O, T>, S, usize, A>;

libafl_libfuzzer/libafl_libfuzzer_runtime/src/lib.rs

@@ -168,7 +168,7 @@ macro_rules! fuzz_with {
                 I2SRandReplace, StdScheduledMutator, StringCategoryRandMutator, StringSubcategoryRandMutator,
                 StringCategoryTokenReplaceMutator, StringSubcategoryTokenReplaceMutator, Tokens, tokens_mutations
             },
-            observers::{stacktrace::BacktraceObserver, TimeObserver},
+            observers::{stacktrace::BacktraceObserver, TimeObserver, TrackingHinted},
             schedulers::{
                 IndexesLenTimeMinimizerScheduler, powersched::PowerSchedule, PowerQueueScheduler,
             },
@@ -198,7 +198,7 @@ macro_rules! fuzz_with {
             let grimoire_metadata = should_use_grimoire(&mut state, &$options, &mutator_status)?;
             let grimoire = grimoire_metadata.should();
 
-            let edges_observer = edge_maker();
+            let edges_observer = edge_maker().track_indices().track_novelties();
             let size_edges_observer = MappedEdgeMapObserver::new(edge_maker(), SizeValueObserver::default());
 
             let keep_observer = LibfuzzerKeepFeedback::new();
@@ -220,8 +220,8 @@ macro_rules! fuzz_with {
             );
 
             // New maximization map feedback linked to the edges observer
-            let map_feedback = MaxMapFeedback::tracking(&edges_observer, true, true);
-            let shrinking_map_feedback = ShrinkMapFeedback::tracking(&size_edges_observer, false, false);
+            let map_feedback = MaxMapFeedback::new(&edges_observer);
+            let shrinking_map_feedback = ShrinkMapFeedback::new(&size_edges_observer);
 
             // Set up a generalization stage for grimoire
             let generalization = GeneralizationStage::new(&edges_observer);
@@ -412,7 +412,7 @@ macro_rules! fuzz_with {
             let grimoire = IfStage::new(|_, _, _, _| Ok(grimoire.into()), (StdMutationalStage::transforming(grimoire_mutator), ()));
 
             // A minimization+queue policy to get testcasess from the corpus
-            let scheduler = IndexesLenTimeMinimizerScheduler::new(PowerQueueScheduler::new(&mut state, &edges_observer, PowerSchedule::FAST));
+            let scheduler = IndexesLenTimeMinimizerScheduler::new(&edges_observer, PowerQueueScheduler::new(&mut state, &edges_observer, PowerSchedule::FAST));
 
             // A fuzzer with feedbacks and a corpus scheduler
             let mut fuzzer = StdFuzzer::new(scheduler, feedback, objective);

libafl_libfuzzer/libafl_libfuzzer_runtime/src/merge.rs

@@ -104,7 +104,7 @@ pub fn merge(
     let edges_observer =
         MappedEdgeMapObserver::new(edges_observer, SizeTimeValueObserver::new(time));
 
-    let map_feedback = MinMapFeedback::tracking(&edges_observer, false, true);
+    let map_feedback = MinMapFeedback::new(&edges_observer);
 
     // Create an OOM observer to monitor if an OOM has occurred
     let oom_observer = OomObserver::new(options.rss_limit(), options.malloc_limit());

libafl_libfuzzer/libafl_libfuzzer_runtime/src/observers.rs

@@ -55,6 +55,18 @@ where
     }
 }
 
+impl<M, O> AsRef<Self> for MappedEdgeMapObserver<M, O> {
+    fn as_ref(&self) -> &Self {
+        self
+    }
+}
+
+impl<M, O> AsMut<Self> for MappedEdgeMapObserver<M, O> {
+    fn as_mut(&mut self) -> &mut Self {
+        self
+    }
+}
+
 impl<M, O> HasLen for MappedEdgeMapObserver<M, O>
 where
     M: HasLen,