ossfuzz: update build (#106)

tests/fuzz_main.c

@@ -1,9 +1,11 @@
-#include <spng_read_fuzzer.cc>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 /* fuzz target entry point, works without libFuzzer */
 
+int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
+
 int main(int argc, char **argv)
 {
     FILE *f;

tests/meson.build

@@ -4,7 +4,7 @@ cpp = meson.get_compiler('cpp')
 if cc.has_function('fmemopen', prefix : '#include <stdio.h>', args : '-D_GNU_SOURCE')
     repro_exe = executable(
         'fuzz_repro',
-        'fuzz_main.c',
+        'fuzz_main.c', 'spng_read_fuzzer.c',
         c_args : '-D_GNU_SOURCE',
         link_with : spng_lib)
 endif

tests/ossfuzz.sh

@@ -21,18 +21,24 @@ ar x libz.a
 ar rcs libspng_static.a *.o
 
 $CXX $CXXFLAGS -std=c++11 \
-    $SRC/libspng/tests/spng_read_fuzzer.cc \
+    $SRC/libspng/tests/spng_read_fuzzer.c \
     -o $OUT/spng_read_fuzzer \
     $LIB_FUZZING_ENGINE $SRC/libspng/build/libspng_static.a $SRC/zlib/build/libz.a
 
 $CXX $CXXFLAGS -std=c++11 -I$SRC/zlib/build -I$SRC/zlib \
-    $SRC/libspng/tests/spng_read_fuzzer.cc \
+    $SRC/libspng/tests/spng_read_fuzzer.c \
     -o $OUT/spng_read_fuzzer_structure_aware \
     -include $SRC/fuzzer-test-suite/libpng-1.2.56/png_mutator.h \
     -D PNG_MUTATOR_DEFINE_LIBFUZZER_CUSTOM_MUTATOR \
     $LIB_FUZZING_ENGINE $SRC/libspng/build/libspng_static.a $SRC/zlib/build/libz.a
 
-find $SRC/libspng/tests/images -name "*.png" | \
-     xargs zip $OUT/spng_read_fuzzer_seed_corpus.zip
+find $SRC/libspng/tests -name "*.png" | \
+     xargs zip $OUT/seed_corpus.zip
 
-cp $SRC/libspng/tests/spng_read_fuzzer.dict $OUT/
+cp $SRC/libspng/tests/spng.dict $OUT/
+
+ln -sf $OUT/seed_corpus.zip $OUT/spng_read_fuzzer_seed_corpus.zip
+ln -sf $OUT/seed_corpus.zip $OUT/spng_read_fuzzer_structure_aware_seed_corpus.zip
+
+ln -sf $OUT/spng.dict $OUT/spng_read_fuzzer.dict
+ln -sf $OUT/spng.dict $OUT/spng_read_fuzzer_structure_aware.dict