Use Compound configurations in libpng launcher fuzzer (#1676)

Author: s1341

fuzzers/libfuzzer_libpng_launcher/Makefile.toml

@@ -58,7 +58,7 @@ windows_alias = "unsupported"
 [tasks.lib_unix]
 script_runner="@shell"
 script='''
-cd libpng-1.6.37 && ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
+cd libpng-1.6.37 && CC="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc" CXX="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" ./configure --enable-shared=no --with-pic=yes --enable-hardware-optimizations=yes
 cd "${PROJECT_DIR}"
 make -C libpng-1.6.37 CC="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc" CXX="${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cxx" LIBTOOL=${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_libtool
 '''

fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_ar.rs

@@ -16,10 +16,14 @@ pub fn main() {
                 Configuration::GenerateCoverageMap,
                 Configuration::CmpLog,
             ]))
-            .add_configuration(Configuration::UndefinedBehaviorSanitizer)
-            .add_configuration(Configuration::AddressSanitizer)
-            // .add_arg("-fsanitize-coverage=trace-pc-guard,trace-cmp")
-            // .add_arg("-fsanitize=address")
+            .add_configuration(Configuration::Compound(vec![
+                Configuration::GenerateCoverageMap,
+                Configuration::AddressSanitizer,
+            ]))
+            .add_configuration(Configuration::Compound(vec![
+                Configuration::GenerateCoverageMap,
+                Configuration::UndefinedBehaviorSanitizer,
+            ]))
             .run()
             .expect("Failed to run the wrapped libtool")
         {

fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_cc.rs

@@ -29,10 +29,14 @@ pub fn main() {
                 Configuration::GenerateCoverageMap,
                 Configuration::CmpLog,
             ]))
-            .add_configuration(Configuration::UndefinedBehaviorSanitizer)
-            .add_configuration(Configuration::AddressSanitizer)
-            // .add_arg("-fsanitize-coverage=trace-pc-guard,trace-cmp")
-            // .add_arg("-fsanitize=address")
+            .add_configuration(Configuration::Compound(vec![
+                Configuration::GenerateCoverageMap,
+                Configuration::AddressSanitizer,
+            ]))
+            .add_configuration(Configuration::Compound(vec![
+                Configuration::GenerateCoverageMap,
+                Configuration::UndefinedBehaviorSanitizer,
+            ]))
             .run()
             .expect("Failed to run the wrapped compiler")
         {

fuzzers/libfuzzer_libpng_launcher/src/bin/libafl_libtool.rs

@@ -16,10 +16,14 @@ pub fn main() {
                 Configuration::GenerateCoverageMap,
                 Configuration::CmpLog,
             ]))
-            .add_configuration(Configuration::UndefinedBehaviorSanitizer)
-            .add_configuration(Configuration::AddressSanitizer)
-            // .add_arg("-fsanitize-coverage=trace-pc-guard,trace-cmp")
-            // .add_arg("-fsanitize=address")
+            .add_configuration(Configuration::Compound(vec![
+                Configuration::GenerateCoverageMap,
+                Configuration::AddressSanitizer,
+            ]))
+            .add_configuration(Configuration::Compound(vec![
+                Configuration::GenerateCoverageMap,
+                Configuration::UndefinedBehaviorSanitizer,
+            ]))
             .run()
             .expect("Failed to run the wrapped libtool")
         {