ClusterFuzzLite build integration

.clusterfuzzlite/Dockerfile

@@ -0,0 +1,5 @@
+FROM gcr.io/oss-fuzz-base/base-builder:v1
+RUN apt-get update && apt-get install -y make autoconf automake libtool meson bison libxml2-dev pkg-config valgrind
+COPY . $SRC/libxkbcommon
+WORKDIR $SRC/libxkbcommon
+COPY .clusterfuzzlite/build.sh $SRC/

.clusterfuzzlite/build.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -eu
+# https://google.github.io/clusterfuzzlite/build-integration/
+
+: ${LD:="${CXX}"}
+: ${LDFLAGS:="${CXXFLAGS}"}
+
+rm -rf build
+meson setup build -Denable-x11=false -Denable-wayland=false -Denable-docs=false
+ninja -C build
+
+# "even if your project is written in pure C you must use $CXX to link your fuzz target binaries"
+$CXX $CXXFLAGS -std=c++11 -Ibuild/ $SRC/fuzz/compose/target.c -o $OUT/compose_fuzzer $LIB_FUZZING_ENGINE build/libxkbcommon.so

.clusterfuzzlite/project.yaml

@@ -0,0 +1 @@
+language: c

fuzz/compose/target.c

@@ -10,37 +10,16 @@
 #include "xkbcommon/xkbcommon.h"
 #include "xkbcommon/xkbcommon-compose.h"
 
-int
-main(int argc, char *argv[])
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 {
     struct xkb_context *ctx;
-    FILE *file;
     struct xkb_compose_table *table;
-
-    if (argc != 2) {
-        fprintf(stderr, "usage: %s <file>\n", argv[0]);
-        return 1;
-    }
-
-    ctx = xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES | XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
+    ctx = xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES); // | XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
     assert(ctx);
-
-#ifdef __AFL_HAVE_MANUAL_CONTROL
-  __AFL_INIT();
-
-    while (__AFL_LOOP(1000))
-#endif
-    {
-        file = fopen(argv[1], "rb");
-        assert(file);
-        table = xkb_compose_table_new_from_file(ctx, file,
-                                                "en_US.UTF-8",
-                                                XKB_COMPOSE_FORMAT_TEXT_V1,
-                                                XKB_COMPOSE_COMPILE_NO_FLAGS);
-        xkb_compose_table_unref(table);
-        fclose(file);
-    }
-
-    puts(table ? "OK" : "FAIL");
+    table = xkb_compose_table_new_from_buffer(ctx, (const char*) data, size, "en_US.UTF-8",
+                                      XKB_COMPOSE_FORMAT_TEXT_V1,
+                                      XKB_COMPOSE_COMPILE_NO_FLAGS);
+    xkb_compose_table_unref(table);
     xkb_context_unref(ctx);
+    return 0;
 }

fuzz/keymap/target.c

@@ -9,36 +9,17 @@
 
 #include "xkbcommon/xkbcommon.h"
 
-int
-main(int argc, char *argv[])
+int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 {
     struct xkb_context *ctx;
-    FILE *file;
     struct xkb_keymap *keymap;
-
-    if (argc != 2) {
-        fprintf(stderr, "usage: %s <file>\n", argv[0]);
-        return 1;
-    }
-
     ctx = xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES | XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
     assert(ctx);
-
-#ifdef __AFL_HAVE_MANUAL_CONTROL
-  __AFL_INIT();
-
-    while (__AFL_LOOP(1000))
-#endif
-    {
-        file = fopen(argv[1], "rb");
-        assert(file);
-        keymap = xkb_keymap_new_from_file(ctx, file,
-                                          XKB_KEYMAP_FORMAT_TEXT_V1,
-                                          XKB_KEYMAP_COMPILE_NO_FLAGS);
-        xkb_keymap_unref(keymap);
-        fclose(file);
-    }
-
-    puts(keymap ? "OK" : "FAIL");
+    keymap = xkb_keymap_new_from_buffer(ctx, data, size,
+                                      XKB_KEYMAP_FORMAT_TEXT_V1,
+                                      XKB_KEYMAP_COMPILE_NO_FLAGS);
+    xkb_keymap_unref(keymap);
     xkb_context_unref(ctx);
+    return 0;
 }
+

meson.build

@@ -19,6 +19,7 @@ cflags = [
     '-fno-strict-aliasing',
     '-fsanitize-undefined-trap-on-error',
     '-Wno-unused-parameter',
+    '-Wno-unused-function',
     '-Wno-missing-field-initializers',
     '-Wpointer-arith',
     '-Wmissing-declarations',
@@ -32,6 +33,7 @@ cflags = [
     '-Wdate-time',
     '-Wwrite-strings',
     '-Wno-documentation-deprecated-sync',
+    '-Werror=unused-command-line-argument',
 ]
 add_project_arguments(cc.get_supported_arguments(cflags), language: 'c')
 
@@ -726,11 +728,6 @@ else
 endif
 
 
-# Fuzzing target programs.
-executable('fuzz-keymap', 'fuzz/keymap/target.c', dependencies: test_dep)
-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
-
-
 # Benchmarks.
 bench_env = environment()
 bench_env.set('top_srcdir', meson.source_root())