diff --git a/fuzzers/libfuzzer_libmozjpeg/build.rs b/fuzzers/libfuzzer_libmozjpeg/build.rs index a3ced5b2bb..e71dafcc01 100644 --- a/fuzzers/libfuzzer_libmozjpeg/build.rs +++ b/fuzzers/libfuzzer_libmozjpeg/build.rs @@ -48,16 +48,13 @@ fn main() { .arg(&libmozjpeg_tar) .status() .unwrap(); - Command::new(format!("{}/cmake", &libmozjpeg)) - .current_dir(&out_dir_path) - .args(&[ - "-G\"Unix Makefiles\"", - "--disable-shared", - &libmozjpeg, - "CC=clang", - "CFLAGS=-O3 -g -D_DEFAULT_SOURCE -fPIE -fsanitize-coverage=trace-pc-guard", - "LDFLAGS=-g -fPIE -fsanitize-coverage=trace-pc-guard", - ]) + //println!("cargo:warning=Running cmake on {}", &libmozjpeg); + + Command::new("cmake") + .current_dir(&libmozjpeg_path) + .args(&["-G", "Unix Makefiles", "--disable-shared"]) + .arg(&libmozjpeg) + .env("OPT_LEVEL", "3") .env("CC", "clang") .env("CXX", "clang++") .env( @@ -68,13 +65,17 @@ fn main() { "CXXFLAGS", "-O3 -g -D_DEFAULT_SOURCE -fPIE -fsanitize-coverage=trace-pc-guard", ) - .env("LDFLAGS", "-g -fPIE -fsanitize-coverage=trace-pc-guard"); + .env("LDFLAGS", "-g -fPIE -fsanitize-coverage=trace-pc-guard") + .status() + .unwrap(); + Command::new("make") .current_dir(&libmozjpeg_path) //.arg(&format!("-j{}", num_cpus::get())) .args(&[ "CC=clang", "CXX=clang++", + "OPT_LEVEL=3", "CFLAGS=-O3 -g -D_DEFAULT_SOURCE -fPIE -fsanitize-coverage=trace-pc-guard", "LDFLAGS=-g -fPIE -fsanitize-coverage=trace-pc-guard", "CXXFLAGS=-D_DEFAULT_SOURCE -fPIE -fsanitize-coverage=trace-pc-guard", diff --git a/fuzzers/libfuzzer_libmozjpeg/src/fuzzer.rs b/fuzzers/libfuzzer_libmozjpeg/src/fuzzer.rs index cafe05bc1b..4634c7fd31 100644 --- a/fuzzers/libfuzzer_libmozjpeg/src/fuzzer.rs +++ b/fuzzers/libfuzzer_libmozjpeg/src/fuzzer.rs @@ -8,10 +8,9 @@ use libafl::{ bolts::{shmem::UnixShMem, tuples::tuple_list}, corpus::{Corpus, InMemoryCorpus, OnDiskCorpus, RandCorpusScheduler}, events::setup_restarting_mgr, - executors::{inprocess::InProcessExecutor, Executor, ExitKind}, + executors::{inprocess::InProcessExecutor, ExitKind}, feedbacks::{CrashFeedback, MaxMapFeedback}, fuzzer::{Fuzzer, HasCorpusScheduler, StdFuzzer}, - inputs::Input, mutators::scheduled::HavocBytesMutator, mutators::token_mutations::Tokens, observers::StdMapObserver,