From d3df955ba7ca4e302c0a4a3b22c5003889959aef Mon Sep 17 00:00:00 2001 From: Abhishek Arya Date: Tue, 9 May 2017 23:23:47 -0700 Subject: [PATCH] Fix Skia UBSan vptr issue and enable msan. (#587) --- projects/skia/build.sh | 7 ++++++- projects/skia/project.yaml | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/projects/skia/build.sh b/projects/skia/build.sh index 43bb47d14..2dd57dbfe 100644 --- a/projects/skia/build.sh +++ b/projects/skia/build.sh @@ -15,6 +15,10 @@ # ################################################################################ +# Disable UBSan vptr since target built with -fno-rtti. +export CFLAGS="$CFLAGS -fno-sanitize=vptr" +export CXXFLAGS="$CXXFLAGS -fno-sanitize=vptr" + # This splits a space separated list into a quoted, comma separated list for gn. export CXXFLAGS_ARR=`echo $CXXFLAGS | sed -e "s/\s/\",\"/g"` $SRC/depot_tools/gn gen out/Fuzz\ @@ -31,4 +35,5 @@ $SRC/depot_tools/gn gen out/Fuzz\ $SRC/depot_tools/ninja -C out/Fuzz fuzz_region_deserialize cp out/Fuzz/fuzz_region_deserialize $OUT/region_deserialize -cp ./region_deserialize.options $OUT/region_deserialize.options \ No newline at end of file +cp ./region_deserialize.options $OUT/region_deserialize.options + diff --git a/projects/skia/project.yaml b/projects/skia/project.yaml index ed2c60111..b52f8b489 100644 --- a/projects/skia/project.yaml +++ b/projects/skia/project.yaml @@ -2,3 +2,7 @@ homepage: "https://github.com/google/skia" primary_contact: "kjlubick@chromium.org" auto_ccs: - "hcm@chromium.org" +sanitizers: + - address + - undefined + - memory