From a215f3fd82fa5a4ed3f323dbd86514ed83eb471b Mon Sep 17 00:00:00 2001 From: tsdgeos Date: Fri, 18 Feb 2022 15:48:30 +0100 Subject: [PATCH] poppler: Re-enable the memory sanitizer (#7299) --- projects/poppler/build.sh | 4 +++- projects/poppler/project.yaml | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/poppler/build.sh b/projects/poppler/build.sh index b8c87f12b..fa7ee3160 100755 --- a/projects/poppler/build.sh +++ b/projects/poppler/build.sh @@ -59,7 +59,7 @@ elif [ "$SANITIZER" = "coverage" ]; then CXXFLAGS="${CXXFLAGS/"-fprofile-instr-generate"/" "}" fi -./nss/build.sh $nss_flag --disable-tests --static -v -Dmozilla_client=1 -Dzlib_libs=$PREFIX/lib/libz.a +./nss/build.sh $nss_flag --disable-tests --static -v -Dmozilla_client=1 -Dzlib_libs=$PREFIX/lib/libz.a -Dsign_libs=0 CFLAGS="$SAVE_CFLAGS" CXXFLAGS="$SAVE_CXXFLAGS" @@ -150,6 +150,8 @@ sed -i -e "s/QMAKE_LFLAGS += -stdlib=libc++/QMAKE_LFLAGS += -stdlib=li sed -i -e "s/TARGET = qtharfbuzz/TARGET = qtharfbuzz\nQMAKE_CXXFLAGS += -fno-sanitize=vptr/g" src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro # make qmake compile faster sed -i -e "s/MAKE\")/MAKE\" -j$(nproc))/g" configure +# Fix memory stuff in qt 5.15 unfixable since branch is closed now +sed -i -e "s/struct statx statxBuffer/struct statx statxBuffer = {}/g" src/corelib/io/qfilesystemengine_unix.cpp ./configure --glib=no --libpng=qt -opensource -confirm-license -static -no-opengl -no-icu -no-pkg-config -platform linux-clang-libc++ -nomake tests -nomake examples -prefix $PREFIX -D QT_NO_DEPRECATED_WARNINGS make -j$(nproc) make install diff --git a/projects/poppler/project.yaml b/projects/poppler/project.yaml index bb1ae170c..c12379633 100644 --- a/projects/poppler/project.yaml +++ b/projects/poppler/project.yaml @@ -3,10 +3,9 @@ language: c++ primary_contact: tsdgeos@gmail.com sanitizers: - address -# Disabled MSAN because of https://github.com/google/oss-fuzz/issues/6294 -# - memory + - memory - undefined auto_ccs: - jonathan@titanous.com - adam.reichold@t-online.de -main_repo: 'https://anongit.freedesktop.org/git/poppler/poppler.git' \ No newline at end of file +main_repo: 'https://anongit.freedesktop.org/git/poppler/poppler.git'