clusterfuzzlite: update build to optionally build fuzzers

Author: boxerab

.clusterfuzzlite/build.sh

@@ -1,20 +1,42 @@
 #!/bin/bash -eu
 
-# Build libcss and dependencies
+# Install additional dependencies if needed (ClusterFuzzLite base has most, but ensure)
+apt-get update && apt-get install -y meson ninja-build python3 clang llvm
+
+# Do NOT override CFLAGS/CXXFLAGS/LDFLAGS here, as ClusterFuzzLite already sets appropriate flags
+# like -fsanitize=address,undefined,fuzzer-no-link for compilation.
+# Overriding causes conflicts (e.g., duplicate/mismatched sanitizer flags) that break Meson's compiler check.
+
+# Set CC and CXX to clang if not already (ClusterFuzzLite usually does this)
+export CC="${CC:-clang}"
+export CXX="${CXX:-clang++}"
+
+# Build dependencies if not subprojects (assuming wrap files handle them)
 cd $SRC/libcss
-rm -rf build || true  # Wipe old build dir if it exists, ignore if not
-mkdir -p build
-cd build
-meson setup .. --default-library=static
-ninja -j$(nproc)
-ninja install
-cd ../..
-
-
-# Set executable permissions for fuzzer build scripts
-chmod +x $SRC/libcss/test/fuzzers/build_google_oss_fuzzers.sh
-chmod +x $SRC/libcss/test/fuzzers/build_seed_corpus.sh
-
-# Build fuzzers and seed corpus
-$SRC/libcss/test/fuzzers/build_google_oss_fuzzers.sh
-$SRC/libcss/test/fuzzers/build_seed_corpus.sh
+meson subprojects update || true  # If using subprojects/wraps for libwapcaplet, libparserutils
+
+# Clean and setup Meson with fuzzing enabled
+rm -rf build || true
+meson setup build \
+  --default-library=static \
+  --buildtype=plain \
+  -Db_sanitize=none \
+  -Db_lundef=false \
+  -Dfuzzing=true
+
+# Build
+ninja -C build -j$(nproc)
+
+# Install if needed (but for fuzzing, probably not necessary since static)
+ninja -C build install || true
+
+# Copy the fuzzer binary to $OUT
+cp build/css_parse_fuzzer $OUT/
+
+# Optional: Build seed corpus (zip test data or examples)
+mkdir -p css_parse_fuzzer_seed_corpus
+# Add some seed files, e.g., from test data
+cp -r test/data/* css_parse_fuzzer_seed_corpus/ || true  # Adjust path to your test CSS files
+zip -r $OUT/css_parse_fuzzer_seed_corpus.zip css_parse_fuzzer_seed_corpus || true
+
+# If you have multiple fuzzers, repeat cp and seed steps

meson.build

@@ -1,4 +1,4 @@
-project('libcss', 'c',
+project('libcss', ['c', 'cpp'],
   version: '0.9.2',
   default_options: ['c_std=c99', 'warning_level=2'])
 
@@ -395,4 +395,22 @@ if get_option('tests')
       )
     endif
   endforeach
+endif
+
+
+# Fuzzing option (enable with -Dfuzzing=true)
+if get_option('fuzzing')
+  # Assume Clang is used for libFuzzer
+  fuzz_c_args = ['-fsanitize=fuzzer,address,undefined', '-fno-omit-frame-pointer', '-g', '-O1']
+  fuzz_link_args = ['-fsanitize=fuzzer,address,undefined']
+
+  executable('css_parse_fuzzer',
+    sources: 'test/fuzzers/css_parse_fuzzer.cc',
+    include_directories: inc,
+    c_args: [cflags, fuzz_c_args],
+    link_args: fuzz_link_args,
+    dependencies: [parserutils_dep, wapcaplet_dep],
+    link_with: libcss_lib,
+    install: false
+  )
 endif

meson_options.txt

@@ -1 +1,2 @@
-option('tests', type: 'boolean', value: false, description: 'Enable test suite')
+option('tests', type: 'boolean', value: false, description: 'Enable test suite')
+option('fuzzing', type: 'boolean', value: false, description: 'Enable fuzzer build')