Merge pull request #16497 from DaanDeMeyer/mkosi

[thirdparty/systemd.git] / tools / oss-fuzz.sh

diff --git a/tools/oss-fuzz.sh b/tools/oss-fuzz.sh
index 6884048d83e28a5703749ce9510220113e9f351a..5b8690b687fe199d8e8dd121aab3f06129068f43 100755 (executable)
--- a/tools/oss-fuzz.sh
+++ b/tools/oss-fuzz.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1+
 
 set -ex
@@ -27,15 +27,17 @@ build=$WORK/build
 rm -rf $build
 mkdir -p $build
 
-fuzzflag="oss-fuzz=true"
 if [ -z "$FUZZING_ENGINE" ]; then
     fuzzflag="llvm-fuzz=true"
+else
+    fuzzflag="oss-fuzz=true"
+    if [[ "$SANITIZER" == undefined ]]; then
+        UBSAN_FLAGS="-fsanitize=pointer-overflow -fno-sanitize-recover=pointer-overflow"
+        CFLAGS="$CFLAGS $UBSAN_FLAGS"
+        CXXFLAGS="$CXXFLAGS $UBSAN_FLAGS"
+    fi
 fi
 
-# FIXME: temporarily pin the meson version as 0.53 doesn't work with older python 3.5
-# See: https://github.com/mesonbuild/meson/issues/6427
-pip3 install meson==0.52.1
-
 meson $build -D$fuzzflag -Db_lundef=false
 ninja -v -C $build fuzzers