Merge branch 'google:master' into upstream-gitpython

Author: DaveLak

projects/bitcoin-core/build.sh

@@ -54,7 +54,9 @@ sed -i "s|PROVIDE_FUZZ_MAIN_FUNCTION|NEVER_PROVIDE_MAIN_FOR_OSS_FUZZ|g" "./confi
 # * --enable-fuzz, see https://github.com/bitcoin/bitcoin/blob/master/doc/fuzzing.md
 # * CONFIG_SITE, see https://github.com/bitcoin/bitcoin/blob/master/depends/README.md
 if [ "$SANITIZER" = "memory" ]; then
-  CONFIG_SITE="$PWD/depends/$BUILD_TRIPLET/share/config.site" ./configure --enable-fuzz SANITIZER_LDFLAGS="$LIB_FUZZING_ENGINE" --disable-hardening
+  # _FORTIFY_SOURCE is not compatible with MSAN.
+  export CPPFLAGS="${CPPFLAGS} -U_FORTIFY_SOURCE"
+  CONFIG_SITE="$PWD/depends/$BUILD_TRIPLET/share/config.site" ./configure --enable-fuzz SANITIZER_LDFLAGS="$LIB_FUZZING_ENGINE"
 else
   CONFIG_SITE="$PWD/depends/$BUILD_TRIPLET/share/config.site" ./configure --enable-fuzz SANITIZER_LDFLAGS="$LIB_FUZZING_ENGINE"
 fi

projects/cloud-hypervisor/project.yaml

@@ -1,12 +1,11 @@
 homepage: "https://github.com/cloud-hypervisor/cloud-hypervisor"
 language: rust
-primary_contact: "sebastien.boeuf@intel.com"
+primary_contact: "chen.bo@intel.com"
 auto_ccs:
   - "[email protected]"
   - "[email protected]"
   - "[email protected]"
   - "[email protected]"
-  - "[email protected]"
   - "[email protected]"
   - "[email protected]"
   - "[email protected]"

projects/pygments/Dockerfile

@@ -21,6 +21,8 @@ RUN git clone \
 	--branch master \
 	https://github.com/pygments/pygments.git
 
+RUN python3 -m pip install --upgrade pip
+
 WORKDIR pygments
 
 RUN git clone --depth 1 https://github.com/google/fuzzing

projects/pygments/build.sh

@@ -16,7 +16,7 @@
 ################################################################################
 
 # Build and install project (using current CFLAGS, CXXFLAGS).
-pip3 install .
+python3 -m pip install .
 
 # Build fuzzers in $OUT.
 for fuzzer in $(find $SRC -name 'fuzz_*.py'); do

projects/suricata/build.sh

@@ -86,7 +86,7 @@ then
 fi
 
 fuzz_branches=("")
-if [[ "$SANITIZER" != "memory" ]]
+if [[ "$SANITIZER" != "memory" ]] && [[ ! -v CIFUZZ ]]
 then
     fuzz_branches+=("6")
     fuzz_branches+=("7")
@@ -131,11 +131,6 @@ cat generic.dict >> $OUT/fuzz_applayerparserparse$branch.dict
 cat generic.dict >> $OUT/fuzz_sigpcap$branch.dict
 cat generic.dict >> $OUT/fuzz_sigpcap_aware$branch.dict
 
-df
-# clean to leave enough space for CIFuzz
-make clean
-df
-
 # build corpuses
 # default configuration file
 zip -r $OUT/fuzz_confyamlloadstring"$branch"_seed_corpus.zip suricata.yaml