From 468c5f6bfa34b7e37bae68e398d37e405ab1c989 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Thu, 17 Dec 2020 15:20:29 +0100 Subject: [PATCH] code fmt, merge --- fuzzers/libfuzzer/src/lib.rs | 2 +- fuzzers/qemufuzzer/src/lib.rs | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fuzzers/libfuzzer/src/lib.rs b/fuzzers/libfuzzer/src/lib.rs index eee459df65..38a985038e 100644 --- a/fuzzers/libfuzzer/src/lib.rs +++ b/fuzzers/libfuzzer/src/lib.rs @@ -7,7 +7,7 @@ use afl::engines::Engine; use afl::engines::Fuzzer; use afl::engines::State; use afl::engines::StdFuzzer; -use afl::events::{SimpleStats, LlmpEventManager}; +use afl::events::{LlmpEventManager, SimpleStats}; use afl::executors::inmemory::InMemoryExecutor; use afl::executors::{Executor, ExitKind}; use afl::feedbacks::MaxMapFeedback; diff --git a/fuzzers/qemufuzzer/src/lib.rs b/fuzzers/qemufuzzer/src/lib.rs index 38f83b434a..6e555624ad 100644 --- a/fuzzers/qemufuzzer/src/lib.rs +++ b/fuzzers/qemufuzzer/src/lib.rs @@ -7,7 +7,7 @@ use afl::engines::Engine; use afl::engines::Fuzzer; use afl::engines::State; use afl::engines::StdFuzzer; -use afl::events::{SimpleStats, LlmpEventManager}; +use afl::events::{LlmpEventManager, SimpleStats}; use afl::executors::inmemory::InMemoryExecutor; use afl::executors::{Executor, ExitKind}; use afl::feedbacks::MaxMapFeedback; @@ -66,7 +66,11 @@ pub extern "C" fn fuzz_main_loop() { } println!("We're a client, let's fuzz :)"); - let edges_observer = StdMapObserver::new_from_ptr(&NAME_COV_MAP, unsafe { fuzz_hitcounts_map.as_mut_ptr() }, unsafe { fuzz_edges_id }); + let edges_observer = StdMapObserver::new_from_ptr( + &NAME_COV_MAP, + unsafe { fuzz_hitcounts_map.as_mut_ptr() }, + unsafe { fuzz_edges_id }, + ); let edges_feedback = MaxMapFeedback::new_with_observer(&NAME_COV_MAP, &edges_observer); let executor = InMemoryExecutor::new("QEMUFuzzer", harness, tuple_list!(edges_observer));