[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2022-05-09 Thread Caolán McNamara (via logerrit) 
 bin/oss-fuzz-build.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4ec15d5b7c64cd62b6f729c1334c167da5886b4
Author: Caolán McNamara 
AuthorDate: Sun May 8 21:29:10 2022 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 9 10:22:05 2022 +0200

rsc is no more, but concat-deps leaks instead so still need this

Change-Id: I06474f973c1858ed0740232dc75cfd75b8c4706e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134031
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 3d0685f88e2a..d0a206e33bb9 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -28,7 +28,7 @@ export CC_FOR_BUILD="$CC"
 #similarly force the -fsanitize etc args in as well as pthread to get
 #things to link successfully during the build
 export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread"
-#build-time rsc tool leaks a titch
+#build-time concat-deps tool leaks a titch
 export ASAN_OPTIONS="detect_leaks=0"
 
 cd $WORK

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh bin/oss-fuzz-setup.sh

2022-01-01 Thread Jan-Marek Glogowski (via logerrit) 
 bin/oss-fuzz-build.sh |6 +++---
 bin/oss-fuzz-setup.sh |6 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 7f5140fb8cf3d127b5cb8704d277b03de2f63b51
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 13 18:47:50 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sun Jan 2 07:07:56 2022 +0100

oss-fuzz: put LO downloads into $SRC/external-tar

Change-Id: I0d5cf89fabc8e044959dbd0af484b5ca46404eac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127854
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 0b5e0c05e462..3d0685f88e2a 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -38,7 +38,7 @@ if [ -f Makefile ]; then
 fi
 
 print_stamp 0 autogen.sh
-$SRC/libreoffice/autogen.sh --with-distro=LibreOfficeOssFuzz 
--with-external-tar=$SRC
+$SRC/libreoffice/autogen.sh --with-distro=LibreOfficeOssFuzz 
--with-external-tar=$SRC/external-tar
 
 print_stamp 1 make
 make
@@ -52,8 +52,8 @@ for a in *fuzzer; do
 #some minimal fonts required
 mv $a $OUT
 mkdir -p $OUT/$a.fonts
-tar -x -C $OUT/$a.fonts --strip-components=1 --wildcards --no-anchored 
'*.ttf' -f $SRC/liberation-fonts-ttf*
-cp $SRC/*opens___.ttf $OUT/$a.fonts
+tar -x -C $OUT/$a.fonts --strip-components=1 --wildcards --no-anchored 
'*.ttf' -f $SRC/external-tar/liberation-fonts-ttf*
+cp $SRC/external-tar/*opens___.ttf $OUT/$a.fonts
 #minimal runtime requirements
 cp templateservices.rdb $OUT/$a.services.rdb
 cp types.rdb $OUT/$a.types.rdb
diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh
index 18c3fcfb68d9..5566d845f66c 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -7,7 +7,8 @@ echo start downloading dependencies at `date -u`
 # convert FOO := BAR$(MICRO) to FOO=BAR$MICRO
 source <(sed -e's# := #=#g' download.lst | sed -e 's#[)(]##g')
 
-cd $SRC
+mkdir $SRC/external-tar
+cd $SRC/external-tar
 
 #cache build dependencies
 curl --no-progress-meter -S \
@@ -70,6 +71,9 @@ curl --no-progress-meter -S \
 -C - -O https://dev-www.libreoffice.org/src/$EPUBGEN_TARBALL \
 -C - -O https://dev-www.libreoffice.org/src/$LIBNUMBERTEXT_TARBALL \
 -C - -O https://dev-www.libreoffice.org/src/$QXP_TARBALL
+
+cd $SRC
+
 #fuzzing dictionaries
 curl --no-progress-meter -S \
 -C - -O 
https://raw.githubusercontent.com/rc0r/afl-fuzz/master/dictionaries/gif.dict \

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2021-12-29 Thread Jan-Marek Glogowski (via logerrit) 
 bin/oss-fuzz-build.sh |   31 +++
 1 file changed, 23 insertions(+), 8 deletions(-)

New commits:
commit eef42ef32b651a9fd47edd0d8fcb650a2a058831
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 27 21:37:37 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Dec 30 00:16:24 2021 +0100

oss-fuzz: add more verbose output to build script

* dump git HEAD status on build start
* dump "date -r" and "df -h $OUT $WORK" at various steps
* run "make clean" before autogen.sh, if Makefile exists

Change-Id: I22885f820e81fa46d02699fb5c2129ac5921c5dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127609
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index d0f4564a930e..0b5e0c05e462 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -7,7 +7,17 @@ if [ -z "${OUT}" ] || [ -z "${SRC}" ] || [ -z "${WORK}" ]; then
 exit 1
 fi
 
-echo start at `date -u`
+print_stamp()
+{
+local do_df="$1"; shift
+echo "[[" `date -u` "]]" "build -" "$@"
+if [ "$do_df" != "0" ]; then
+df -h $OUT $WORK
+fi
+}
+
+print_stamp 1 start
+echo git: `git -C $SRC/libreoffice log -1 --pretty=reference`
 
 #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
 #the CXX as the linker and need to pass -stdlib=libc++ to build
@@ -21,15 +31,20 @@ export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib 
-lpthread"
 #build-time rsc tool leaks a titch
 export ASAN_OPTIONS="detect_leaks=0"
 
-df -h $OUT $WORK
-
 cd $WORK
-$SRC/libreoffice/autogen.sh --with-distro=LibreOfficeOssFuzz 
--with-external-tar=$SRC
+if [ -f Makefile ]; then
+print_stamp 0 clean
+make clean
+fi
 
-make clean
+print_stamp 0 autogen.sh
+$SRC/libreoffice/autogen.sh --with-distro=LibreOfficeOssFuzz 
--with-external-tar=$SRC
 
+print_stamp 1 make
 make
 
+print_stamp 1 prepare '$OUT'
+
 pushd instdir/program
 head -c -14 services.rdb  > templateservices.rdb
 tail -c +85 ./services/services.rdb >> templateservices.rdb
@@ -52,15 +67,15 @@ EOF
 done
 popd
 
-df -h $OUT $WORK
-
 #starting corpuses
 for zip_file in $SRC/*_seed_corpus.zip; do
 cp $zip_file $OUT
 done
+
 #fuzzing dictionaries
 cp $SRC/*.dict $OUT
+
 #options files
 cp $SRC/libreoffice/vcl/workben/*.options $OUT
 
-echo end at `date -u`
+print_stamp 1 end

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh configure.ac desktop/Module_desktop.mk distro-configs/LibreOfficeOssFuzz.conf Makefile.in smoketest/Module_smoketest.mk vcl/commonfuzzer.mk vcl/Ex

2021-12-25 Thread Jan-Marek Glogowski (via logerrit) 
 Makefile.in|2 --
 bin/oss-fuzz-build.sh  |9 +
 configure.ac   |4 ++--
 desktop/Module_desktop.mk  |2 ++
 distro-configs/LibreOfficeOssFuzz.conf |2 ++
 smoketest/Module_smoketest.mk  |2 ++
 vcl/Executable_docxfuzzer.mk   |2 ++
 vcl/Executable_fodtfuzzer.mk   |2 ++
 vcl/Executable_htmlfuzzer.mk   |4 +++-
 vcl/Module_vcl.mk  |3 +--
 vcl/commonfuzzer.mk|4 +++-
 vcl/workben/docxfuzzer.cxx |5 -
 vcl/workben/fodtfuzzer.cxx |5 -
 vcl/workben/htmlfuzzer.cxx |2 --
 14 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 37106f20bd5cc016a473fbdb2e9e37da096cff5f
Author: Jan-Marek Glogowski 
AuthorDate: Sun Dec 12 22:03:49 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sat Dec 25 17:05:08 2021 +0100

oss-fuzz: convert to static cross-build

This way we can get rid of the pre-generated locale data and the
special fuzzers target, which invokes a full gbuild make for
every prereqisite, always parsing the whole tree, taking ages.

This also reverts:
- commit d0780b21cfe235c4446adf649eb690f9c1771dd5 ("fix oss-fuzz
  build") by adding epubgen and revenge dependencies.
- commit ff25d6a123beb42476bf42d189b3033a86835b2a ("ofz#41602 fix
  more build failure"), which shouldn't happen anymore since
  commit d47628f287f4377394c4ff488c433bfe254b6abe ("don't want to
  link to system static libs for DISABLE_DYNLOADING")

Change-Id: I3aed9ec62da507254b42e4e7470bae1097b4bc8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127031
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/Makefile.in b/Makefile.in
index 3ac9ce6d3c22..7c30271cffb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -504,8 +504,6 @@ $(BUILDDIR)/vs-code.code-workspace: 
$(BUILDDIR)/vs-code.code-workspace.template
@test -e $@ || cp $< $@ && \
cmp -s $@ $< || echo "ATTN: $(@F) differs from $( templateservices.rdb
diff --git a/configure.ac b/configure.ac
index 1ba896d7defb..f85e0b1701f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3799,7 +3799,7 @@ if test -n "$WIN_MULTI_ARCH" -a -n "$WIN_OTHER_ARCH"; then
 fi
 
 
-if test "$build_cpu" != "$host_cpu" -o \( "$DISABLE_DYNLOADING" = TRUE -a 
"$enable_fuzzers" != yes \); then
+if test "$build_cpu" != "$host_cpu" -o "$DISABLE_DYNLOADING" = TRUE; then
 # To allow building Windows multi-arch releases without cross-tooling
 if test "$DISABLE_DYNLOADING" = TRUE -o \( -z "$WIN_MULTI_ARCH" -a -z 
"$WIN_OTHER_ARCH" \); then
 cross_compiling="yes"
@@ -9574,7 +9574,7 @@ else
 
LIBXML_LIBS="${WORKDIR}/UnpackedTarball/libxml2/win32/bin.msvc/libxml2.lib"
 else
 LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/libxml2/.libs -lxml2"
-if test "$DISABLE_DYNLOADING" = TRUE -a "$ENABLE_FUZZERS" != "TRUE"; 
then
+if test "$DISABLE_DYNLOADING" = TRUE; then
 LIBXML_LIBS="$LIBXML_LIBS -lm"
 fi
 fi
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a03a552e4271..ce8f254d7af1 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -100,9 +100,11 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 else ifeq (,$(filter MACOSX ANDROID iOS HAIKU,$(OS)))
 
+ifeq (,$(filter FUZZERS,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,desktop,\
 Executable_oosplash \
 ))
+endif
 
 endif
 
diff --git a/distro-configs/LibreOfficeOssFuzz.conf 
b/distro-configs/LibreOfficeOssFuzz.conf
index 434452a673f0..5f50f2774bc5 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -8,6 +8,7 @@
 --disable-cups
 --disable-dbus
 --disable-dconf
+--disable-extensions
 --disable-firebird-sdbc
 --disable-gio
 --disable-gtk3
@@ -29,5 +30,6 @@
 --with-locales=en
 --with-system-lockfile
 --without-fonts
+--without-galleries
 --without-java
 --without-webdav
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 217dbfa6543a..5d66a0daa1e4 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -12,10 +12,12 @@ $(eval $(call gb_Module_Module,smoketest))
 
 ifeq ($(CROSS_COMPILING),)
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,smoketest,\
Library_smoketest \
Zip_smoketestdoc \
 ))
+endif
 
 ifneq ($(ENABLE_JAVA),)
 ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),)
diff --git a/vcl/Executable_docxfuzzer.mk b/vcl/Executable_docxfuzzer.mk
index fbacbe92fd98..57bc9020713b 100644
--- a/vcl/Executable_docxfuzzer.mk
+++ b/vcl/Executable_docxfuzzer.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_Executable_use_api,docxfuzzer,\
 
 $(eval $(call gb_Executable_use_externals,docxfuzzer,\
 $(fuzzer_externals) \
+epubgen \
+revenge \
 ))
 
 $(eval

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2021-09-20 Thread Caolán McNamara (via logerrit) 
 bin/oss-fuzz-build.sh |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit c9c9d40f79f1767a0a824fc421f2e476c3f24eb8
Author: Caolán McNamara 
AuthorDate: Mon Sep 20 19:46:21 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Sep 20 20:58:17 2021 +0200

ofz: can now undo temp -L/usr/msan/lib hack

now that https://github.com/google/oss-fuzz/pull/6493 has landed

Change-Id: I38634fec9c3e6c50499f1164d7b873dd1889efe6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122368
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 2bed84d865e4..906cadd500d4 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -12,9 +12,6 @@ echo start at `date -u`
 #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
 #the CXX as the linker and need to pass -stdlib=libc++ to build
 export CXX="$CXX -stdlib=libc++ 
-fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
-if [[ $SANITIZER_FLAGS = *sanitize=memory* ]]; then
-export CXX="$CXX -Wno-unused-command-line-argument -L/usr/msan/lib"
-fi
 export CC="$CC 
-fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
 #similarly force the -fsanitize etc args in as well as pthread to get
 #things to link successfully during the build

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh sc/source unotools/source

2021-09-12 Thread Caolán McNamara (via logerrit) 
 bin/oss-fuzz-build.sh|3 +++
 sc/source/ui/docshell/docsh2.cxx |2 --
 unotools/source/i18n/resmgr.cxx  |   15 ---
 3 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 78a2c0752c599d5dc951b8cf6fbe741bda0eeedd
Author: Caolán McNamara 
AuthorDate: Sun Sep 12 21:08:56 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Sep 12 22:27:02 2021 +0200

ofz: better workaround for broken msan build

workaround https://github.com/google/oss-fuzz/issues/6427 by
forcing use of the libc++.a in /usr/msan/lib when compiling the
msan version

Change-Id: I4e992cd7710b5929e74034db7a49c590349149fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122014
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 906cadd500d4..2bed84d865e4 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -12,6 +12,9 @@ echo start at `date -u`
 #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
 #the CXX as the linker and need to pass -stdlib=libc++ to build
 export CXX="$CXX -stdlib=libc++ 
-fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
+if [[ $SANITIZER_FLAGS = *sanitize=memory* ]]; then
+export CXX="$CXX -Wno-unused-command-line-argument -L/usr/msan/lib"
+fi
 export CC="$CC 
-fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
 #similarly force the -fsanitize etc args in as well as pthread to get
 #things to link successfully during the build
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 46089387f86a..e02b815d2181 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -61,7 +61,6 @@ bool ScDocShell::InitNew( const uno::Reference < 
embed::XStorage >& xStor )
 m_aDocument.GetStyleSheetPool()->CreateStandardStyles();
 m_aDocument.UpdStlShtPtrsFrmNms();
 
-#if !defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
 if (!m_bUcalcTest)
 {
 /* Create styles that are imported through Orcus */
@@ -79,7 +78,6 @@ bool ScDocShell::InitNew( const uno::Reference < 
embed::XStorage >& xStor )
 m_aDocument.GetStyleSheetPool()->setAllParaStandard();
 }
 }
-#endif
 
 //  SetDocumentModified is not allowed anymore in Load/InitNew!
 InitItems();
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index ede78900725b..62991153f01c 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -125,11 +125,6 @@ namespace Translate
 auto aFind = aCache.find(sUnique);
 if (aFind != aCache.end())
 return aFind->second;
-#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
-std::locale aRet;
-aCache[sUnique] = aRet;
-return aRet;
-#else
 boost::locale::generator gen;
 gen.characters(boost::locale::char_facet);
 gen.categories(boost::locale::message_facet | 
boost::locale::information_facet);
@@ -201,14 +196,10 @@ namespace Translate
 
 aCache[sUnique] = aRet;
 return aRet;
-#endif
 }
 
 OUString get(TranslateId sContextAndId, const std::locale )
 {
-#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
-return createFromUtf8(sContextAndId.mpId, strlen(sContextAndId.mpId));
-#else
 assert(!strchr(sContextAndId.mpId, '\004') && "should be using nget, 
not get");
 
 //if it's a key id locale, generate it here
@@ -230,15 +221,10 @@ namespace Translate
 result = result.replaceAll(OUString::fromUtf8("\xC3\x9F"), 
"ss");
 }
 return result;
-#endif
 }
 
 OUString nget(TranslateNId aContextSingularPlural, int n, const 
std::locale )
 {
-#if defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
-const char* pForm = n == 0 ? aContextSingularPlural.mpSingular : 
aContextSingularPlural.mpPlural;
-return createFromUtf8(pForm, strlen(pForm));
-#else
 //if it's a key id locale, generate it here
 if (std::use_facet(loc).language() == "qtz")
 {
@@ -258,7 +244,6 @@ namespace Translate
 result = result.replaceAll(OUString::fromUtf8("\xC3\x9F"), 
"ss");
 }
 return result;
-#endif
 }
 
 static ResHookProc pImplResHookProc = nullptr;

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2021-08-19 Thread Caolán McNamara (via logerrit) 
 bin/oss-fuzz-build.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 602dd66fecd92f97ac9206bb90a83d0a04dc8e59
Author: Caolán McNamara 
AuthorDate: Thu Aug 19 15:16:59 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 19 17:21:15 2021 +0200

use sanitize-excludelist.txt for fuzzing CC as well as CXX

Change-Id: Ia470dbb9ab3ce86bedbadfd69ea145806530e4dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120741
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index efc317f7bf91..36390015dbc2 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -10,6 +10,7 @@ echo start at `date -u`
 #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
 #the CXX as the linker and need to pass -stdlib=libc++ to build
 export CXX="$CXX -stdlib=libc++ 
-fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
+export CC="$CC 
-fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
 #similarly force the -fsanitize etc args in as well as pthread to get
 #things to link successfully during the build
 export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread"

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2021-08-16 Thread Caolán McNamara (via logerrit) 
 bin/oss-fuzz-build.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 017a96aeb8f597de0f739fa8ba29dc56a28c9c0c
Author: Caolán McNamara 
AuthorDate: Mon Aug 16 11:16:49 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 16 12:23:54 2021 +0200

ofz: log with date -u

Change-Id: I9e85ee0f98c3b7cfab15db5e93f65a053996bf00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120534
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 7e77c67497a4..efc317f7bf91 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -5,7 +5,7 @@ if [ -z "${OUT}" ] || [ -z "${SRC}" ] || [ -z "${WORK}" ]; then
 exit 1
 fi
 
-echo start at `date`
+echo start at `date -u`
 
 #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
 #the CXX as the linker and need to pass -stdlib=libc++ to build
@@ -59,4 +59,4 @@ cp $SRC/*.dict $OUT
 #options files
 cp $SRC/libreoffice/vcl/workben/*.options $OUT
 
-echo end at `date`
+echo end at `date -u`

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2021-08-12 Thread Caolán McNamara (via logerrit) 
 bin/oss-fuzz-build.sh |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a5642b8b9690f835cbd07ce3278e425b7aa7b9ff
Author: Caolán McNamara 
AuthorDate: Thu Aug 12 09:39:11 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 12 13:12:23 2021 +0200

ofz: liberation-fonts-ttf alone is sufficient

Change-Id: Ifa6938c759c0c1036120da2eeadefbe00ae96f0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120381
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index dce831260067..7e77c67497a4 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -33,10 +33,8 @@ for a in *fuzzer; do
 #some minimal fonts required
 mv $a $OUT
 mkdir -p $OUT/$a.fonts
-for b in $SRC/liberation*fonts*; do
-tar -x -C $OUT/$a.fonts -v --strip-components=1 --wildcards 
--no-anchored '*.ttf' -f $b
-done
-cp 
$SRC/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 $OUT/$a.fonts
+tar -x -C $OUT/$a.fonts --strip-components=1 --wildcards --no-anchored 
'*.ttf' -f $SRC/liberation-fonts-ttf*
+cp $SRC/*opens___.ttf $OUT/$a.fonts
 #minimal runtime requirements
 cp templateservices.rdb $OUT/$a.services.rdb
 cp types.rdb $OUT/$a.types.rdb

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh Makefile.in

2021-08-08 Thread Caolán McNamara (via logerrit) 
 Makefile.in   |2 +-
 bin/oss-fuzz-build.sh |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 360b9c7d6ee29943475e706582ad1e3d923b592d
Author: Caolán McNamara 
AuthorDate: Sun Aug 8 11:28:17 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Aug 8 17:16:20 2021 +0200

oss-fuzz: drop more_fonts build step and just install the min wanted

Change-Id: I7e03be4c0137f49b8822991f91fdfe4367653c2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120172
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/Makefile.in b/Makefile.in
index 88ce2e3b75d4..e7f614698515 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -492,7 +492,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
 
-fuzzers: StaticLibrary_dtoa StaticLibrary_zlib Library_sal Library_salhelper 
Library_reg Library_store Library_unoidl codemaker Library_cppu 
Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu 
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools 
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_editeng 
Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp 
Library_ucbhelper Rdb_services udkapi offapi Library_icg Library_reflection 
Library_invocadapt Library_bootstrap Library_introspection Library_stocservices 
Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts 
StaticLibrary_boost_locale StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core 
StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer 
StaticLibrary_fuzzer_math Library_forui Library_binaryurp Library_io 
Library_invocation Library_namingservice Library_proxyfac Library_uuresolver 
Module_ure Library_wpftwriter Library
 _sb Executable_pptfuzzer Executable_cgmfuzzer Executable_ww2fuzzer 
Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer 
Executable_slkfuzzer Executable_fodtfuzzer Executable_fodsfuzzer 
Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer 
Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer 
Executable_xlsxfuzzer Executable_pptxfuzzer Executable_htmlfuzzer 
Executable_rtffuzzer Executable_mmlfuzzer Executable_mtpfuzzer 
Executable_olefuzzer Executable_lwpfuzzer Executable_hwpfuzzer 
Executable_wmffuzzer Executable_dxffuzzer Executable_sftfuzzer 
Executable_svmfuzzer Executable_tiffuzzer Executable_epsfuzzer 
Executable_jpgfuzzer Executable_metfuzzer Executable_bmpfuzzer 
Executable_giffuzzer Executable_pngfuzzer Executable_602fuzzer 
Executable_tgafuzzer Executable_pcxfuzzer Executable_psdfuzzer 
Executable_ppmfuzzer Executable_pcdfuzzer Executable_rasfuzzer 
Executable_pctfuzzer Executable_xpmfuzzer Executable_xbmfuzzer
+fuzzers: StaticLibrary_dtoa StaticLibrary_zlib Library_sal Library_salhelper 
Library_reg Library_store Library_unoidl codemaker Library_cppu 
Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu 
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools 
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_editeng 
Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp 
Library_ucbhelper Rdb_services udkapi offapi Library_icg Library_reflection 
Library_invocadapt Library_bootstrap Library_introspection Library_stocservices 
Library_xmlreader Library_gcc3_uno instsetoo_native StaticLibrary_boost_locale 
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc 
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math 
Library_forui Library_binaryurp Library_io Library_invocation 
Library_namingservice Library_proxyfac Library_uuresolver Module_ure 
Library_wpftwriter Library_sb Executa
 ble_pptfuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer 
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer 
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer 
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer 
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer 
Executable_pptxfuzzer Executable_htmlfuzzer Executable_rtffuzzer 
Executable_mmlfuzzer Executable_mtpfuzzer Executable_olefuzzer 
Executable_lwpfuzzer Executable_hwpfuzzer Executable_wmffuzzer 
Executable_dxffuzzer Executable_sftfuzzer Executable_svmfuzzer 
Executable_tiffuzzer Executable_epsfuzzer Executable_jpgfuzzer 
Executable_metfuzzer Executable_bmpfuzzer Executable_giffuzzer 
Executable_pngfuzzer Executable_602fuzzer Executable_tgafuzzer 
Executable_pcxfuzzer Executable_psdfuzzer Executable_ppmfuzzer 
Executable_pcdfuzzer Executable_rasfuzzer Executable_pctfuzzer 
Executable_xpmfuzzer Executable_xbmfuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index e4b4b7eed625..dce831260067 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -33,7 +33,10 @@ for a in *fuzzer;

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2021-08-07 Thread Caolán McNamara (via logerrit) 
 bin/oss-fuzz-build.sh |4 
 1 file changed, 4 insertions(+)

New commits:
commit b793a22aba36f77085ca699966bf9472a7342173
Author: Caolán McNamara 
AuthorDate: Sat Aug 7 21:33:48 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sat Aug 7 22:34:54 2021 +0200

log when fuzzing build starts and ends

Change-Id: Id5db6c6dc799c03013576e0d041ab180ea4ac77f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120168
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index f5fa83cab88b..e4b4b7eed625 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -5,6 +5,8 @@ if [ -z "${OUT}" ] || [ -z "${SRC}" ] || [ -z "${WORK}" ]; then
 exit 1
 fi
 
+echo start at `date`
+
 #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
 #the CXX as the linker and need to pass -stdlib=libc++ to build
 export CXX="$CXX -stdlib=libc++ 
-fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-excludelist.txt"
@@ -55,3 +57,5 @@ done
 cp $SRC/*.dict $OUT
 #options files
 cp $SRC/libreoffice/vcl/workben/*.options $OUT
+
+echo end at `date`

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2021-06-03 Thread MarcoFalke (via logerrit) 
 bin/oss-fuzz-build.sh |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ae837fc93d326919c5003876186d7bce1dae6bce
Author: MarcoFalke 
AuthorDate: Thu Jun 3 08:06:43 2021 +
Commit: Caolán McNamara 
CommitDate: Thu Jun 3 10:56:13 2021 +0200

Avoid timeout in bin/oss-fuzz-build.sh

This may fix https://github.com/google/oss-fuzz/issues/5855

A similar recent fix was https://github.com/google/oss-fuzz/pull/5858

It is assumed that the oss-fuzz builder HDD is too slow, leading to a
timeout. Fix that by breaking the bash wildcard expansion into a for
loop.

I did not test this change.

Change-Id: I3db367d604c46b3d15c91f530fb103ca005b0bc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116642
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 4ebecd6f3c11..f5fa83cab88b 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -48,7 +48,9 @@ popd
 df -h $OUT $WORK
 
 #starting corpuses
-cp $SRC/*_seed_corpus.zip $OUT
+for zip_file in $SRC/*_seed_corpus.zip; do
+cp $zip_file $OUT
+done
 #fuzzing dictionaries
 cp $SRC/*.dict $OUT
 #options files
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh configure.ac download.lst extras/source solenv/flatpak-manifest.in

2020-11-19 Thread Ming Hua (via logerrit) 
 bin/oss-fuzz-build.sh|2 
 configure.ac |2 
 download.lst |2 
 extras/source/truetype/symbol/OpenSymbol.sfd |   98 +--
 solenv/flatpak-manifest.in   |6 -
 5 files changed, 100 insertions(+), 10 deletions(-)

New commits:
commit 52f1115571469f210192cbce6b52e8b7d1d85dc0
Author: Ming Hua 
AuthorDate: Wed Nov 18 09:02:26 2020 +0100
Commit: Mike Kaganski 
CommitDate: Thu Nov 19 16:14:36 2020 +0100

tdf#132938 Add glyphs U+F030-U+F039 to OpenSymbol

Add glyphs U+F030-U+F039 (in Private Use Area) as references to
U+0030-U+0039 (digits 0-9), because font Symbol.ttf has these glyphs and
they are necessary for compatibility with MS Office file formats.

Change-Id: If66ac3ee6fda9c161b36fd6eb459c99646e87541
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105997
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index ce4d110ce48a..4ebecd6f3c11 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -31,7 +31,7 @@ for a in *fuzzer; do
 #some minimal fonts required
 mv $a $OUT
 mkdir -p $OUT/$a.fonts
-cp 
$SRC/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
 ../share/fonts/truetype/Liberation* $OUT/$a.fonts
+cp 
$SRC/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 ../share/fonts/truetype/Liberation* $OUT/$a.fonts
 #minimal runtime requirements
 cp templateservices.rdb $OUT/$a.services.rdb
 cp types.rdb $OUT/$a.types.rdb
diff --git a/configure.ac b/configure.ac
index abaceb94ee0b..031308058854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12701,7 +12701,7 @@ if test "$enable_build_opensymbol" = "yes"; then
 fi
 else
 AC_MSG_RESULT([no])
-
OPENSYMBOL_TTF=884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
+
OPENSYMBOL_TTF=f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 BUILD_TYPE="$BUILD_TYPE OPENSYMBOL"
 fi
 AC_SUBST(OPENSYMBOL_TTF)
diff --git a/download.lst b/download.lst
index 1c932acc04f8..aa49f99d3e33 100644
--- a/download.lst
+++ b/download.lst
@@ -272,4 +272,4 @@ export ZMF_TARBALL := libzmf-0.0.2.tar.xz
 
 NUMBERTEXT_EXTENSION_SHA256SUM := 
1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
 UNOWINREG_SHA256SUM := 
eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
-OPENSYMBOL_SHA256SUM := 
884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
+OPENSYMBOL_SHA256SUM := 
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index c9e9baad1707..32885c1baf1e 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
 FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe
-Version: 102.11
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi 
Abe\nuniF030 <-> uniF039 (c) 2020 Ming Hua
+Version: 102.12
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1144938807
-ModificationTime: 1558881510
+ModificationTime: 1605567303
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
@@ -784,7 +784,7 @@ FitToEm: 1
 WinInfo: 0 34 12
 BeginPrivate: 0
 EndPrivate
-BeginChars: 1053 1053
+BeginChars: 1063 1063
 
 StartChar: Alpha
 Encoding: 0 913 0
@@ -108724,5 +108724,95 @@ SplineSet
  98 1313 l 1,0,-1
 EndSplineSet
 EndChar
+
+StartChar: uniF030
+Encoding: 1053 61488 1053
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1031 48 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF031
+Encoding: 1054 61489 1054
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1032 49 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF032
+Encoding: 1055 61490 1055
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1033 50 N 1 0 0 1 0 0 2
+EndChar
+

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2018-09-15 Thread Libreoffice Gerrit user 
 bin/oss-fuzz-build.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4e59ef9864cc659e7f5560648ed800c3575f805a
Author: Caolán McNamara 
AuthorDate: Sat Sep 15 13:13:54 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 15 13:15:18 2018 +0100

ofz#10326 oss-fuzz move make clean to start

clear previous build results, but leave results of this build in place

Change-Id: Ia2857c7cfb33ac0227323d90828818ceb6e693a8

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index a544a5069ff1..0e37243c8a7c 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -17,6 +17,8 @@ df -h $OUT $WORK
 cd $WORK
 $SRC/libreoffice/autogen.sh --with-distro=LibreOfficeOssFuzz 
--with-external-tar=$SRC
 
+make clean
+
 #build-time rsc tool leaks a titch
 export ASAN_OPTIONS="detect_leaks=0"
 
@@ -51,5 +53,3 @@ cp $SRC/*_seed_corpus.zip $OUT
 cp $SRC/*.dict $OUT
 #options files
 cp $SRC/libreoffice/vcl/workben/*.options $OUT
-
-make clean
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2018-08-13 Thread Libreoffice Gerrit user 
 bin/oss-fuzz-build.sh |4 
 1 file changed, 4 insertions(+)

New commits:
commit fd60696e20b323299941af321e159c03f5c232b4
Author: Caolán McNamara 
AuthorDate: Mon Aug 13 16:32:08 2018 +0100
Commit: Caolán McNamara 
CommitDate: Mon Aug 13 17:32:38 2018 +0200

output oss-fuzz df

Change-Id: Ic5d2cbdbcce29a2d9b9db1485da9ed18a3330e4a
Reviewed-on: https://gerrit.libreoffice.org/58943
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 07c4db955242..b8ea876d85dc 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -12,6 +12,8 @@ export CXX="$CXX -stdlib=libc++ 
-fsanitize-blacklist=$SRC/libreoffice/bin/saniti
 #things to link successfully during the build
 export LDFLAGS="$CFLAGS -Wl,--compress-debug-sections,zlib -lpthread"
 
+df -h $OUT $WORK
+
 cd $WORK
 $SRC/libreoffice/autogen.sh --with-distro=LibreOfficeOssFuzz 
--with-external-tar=$SRC
 
@@ -41,6 +43,8 @@ EOF
 done
 popd
 
+df -h $OUT $WORK
+
 #starting corpuses
 cp $SRC/*_seed_corpus.zip $OUT
 #fuzzing dictionaries
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2018-08-12 Thread Libreoffice Gerrit user 
 bin/oss-fuzz-build.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 20444972edb1dd49af13902a850a8e343d5a60ec
Author: Caolán McNamara 
AuthorDate: Sun Aug 12 21:12:48 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sun Aug 12 22:15:22 2018 +0200

add make clean to oss-fuzz build

Change-Id: Ic591748eedbe82b1c7305ef68156370f1b97f216
Reviewed-on: https://gerrit.libreoffice.org/58904
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index e93105d4f669..5cc1325c6980 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -47,3 +47,5 @@ cp $SRC/*_seed_corpus.zip $OUT
 cp $SRC/*.dict $OUT
 #options files
 cp $SRC/libreoffice/vcl/workben/*.options $OUT
+
+make clean
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2018-06-03 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da7ed9702117a5154540e2b76f41bf5efc857a4f
Author: Caolán McNamara 
Date:   Sun Jun 3 19:32:52 2018 +0100

use prebuilt opens___.ttf in oss-fuzz configuration

Change-Id: I4bbea7e1af34bd5c30e3830ecb58af2b6a3a09d4

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index b988d00bd2eb..e93105d4f669 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -27,7 +27,7 @@ for a in *fuzzer; do
 #some minimal fonts required
 cp $a $OUT
 mkdir -p $OUT/$a.fonts
-cp ../share/fonts/truetype/opens___.ttf 
../share/fonts/truetype/Liberation* $OUT/$a.fonts
+cp 
$SRC/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
 ../share/fonts/truetype/Liberation* $OUT/$a.fonts
 #minimal runtime requirements
 cp templateservices.rdb $OUT/$a.services.rdb
 cp types.rdb $OUT/$a.types.rdb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2018-05-31 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbb95cd1800b6283c0cad35da360a50aca880e1f
Author: Caolán McNamara 
Date:   Thu May 31 11:23:48 2018 +0100

ofz#8644 oss build broken

Change-Id: I51daa79f3f2772d054b7ece248a37b9e5cca4960
Reviewed-on: https://gerrit.libreoffice.org/55121
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 08330daffe2b..b988d00bd2eb 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -27,7 +27,7 @@ for a in *fuzzer; do
 #some minimal fonts required
 cp $a $OUT
 mkdir -p $OUT/$a.fonts
-cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
../share/fonts/truetype/Liberation* $OUT/$a.fonts
+cp ../share/fonts/truetype/opens___.ttf 
../share/fonts/truetype/Liberation* $OUT/$a.fonts
 #minimal runtime requirements
 cp templateservices.rdb $OUT/$a.services.rdb
 cp types.rdb $OUT/$a.types.rdb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh vcl/workben

2018-02-25 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |   26 ++
 vcl/workben/commonfuzzer.hxx  |   19 ++-
 vcl/workben/sftfuzzer.options |2 ++
 3 files changed, 34 insertions(+), 13 deletions(-)

New commits:
commit 1724d7db282ac997dc6d8e9d1e63486e141388f5
Author: Caolán McNamara 
Date:   Sun Feb 25 15:32:50 2018 +

oss-fuzz: issue 1188, per-fuzzer config

instead of copying the whole bunch around, now the scheme is to copy
each individual fuzzer and matching config around, so duplicate the
previously shared config for each one an

Change-Id: I479ea13abfab382b6aee23bc04d5f7e535b489c9

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 99e90c937bb4..08330daffe2b 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -20,15 +20,25 @@ export ASAN_OPTIONS="detect_leaks=0"
 
 make fuzzers
 
-#some minimal fonts required
-cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
instdir/share/fonts/truetype/Liberation* $OUT
-#minimal runtime requirements
-rm -rf $OUT/services $OUT/types $OUT/*rdb
-mkdir $OUT/services
 pushd instdir/program
-cp -r *fuzzer unorc fundamentalrc types.rdb types $OUT
-head -c -14 services.rdb  > $OUT/services.rdb
-tail -c +85 ./services/services.rdb >> $OUT/services.rdb
+head -c -14 services.rdb  > templateservices.rdb
+tail -c +85 ./services/services.rdb >> templateservices.rdb
+for a in *fuzzer; do
+#some minimal fonts required
+cp $a $OUT
+mkdir -p $OUT/$a.fonts
+cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
../share/fonts/truetype/Liberation* $OUT/$a.fonts
+#minimal runtime requirements
+cp templateservices.rdb $OUT/$a.services.rdb
+cp types.rdb $OUT/$a.types.rdb
+cp types/offapi.rdb $OUT/$a.moretypes.rdb
+cat > $OUT/$a.unorc << EOF
+[Bootstrap]
+URE_INTERNAL_LIB_DIR=\${ORIGIN}
+UNO_TYPES=\${ORIGIN}/$a.types.rdb \${ORIGIN}/$a.moretypes.rdb
+UNO_SERVICES=\${ORIGIN}/$a.services.rdb
+EOF
+done
 popd
 
 #starting corpuses
diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index cc4830fa5990..05d35a4e1532 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -49,17 +49,25 @@ namespace
 return uri;
 }
 
+OUString getExecutableName()
+{
+OUString uri;
+if (osl_getExecutableFile() != osl_Process_E_None) {
+abort();
+}
+return uri.copy(uri.lastIndexOf('/') + 1);
+}
+
 void setFontConfigConf(const OUString )
 {
 osl::File aFontConfig("file:///tmp/wmffuzzerfonts.conf");
 if (aFontConfig.open(osl_File_OpenFlag_Create | 
osl_File_OpenFlag_Write) == osl::File::E_None)
 {
-OUString path;
-osl::FileBase::getSystemPathFromFileURL(execdir, path);
-OString sFontDir = OUStringToOString(path, 
osl_getThreadTextEncoding());
+OUString sExecDir;
+osl::FileBase::getSystemPathFromFileURL(execdir, sExecDir);
 
 rtl::OStringBuffer aBuffer("\n");
-aBuffer.append(sFontDir);
+aBuffer.append(OUStringToOString(sExecDir + getExecutableName() + 
".fonts", osl_getThreadTextEncoding());
 
aBuffer.append("/tmp/cache/fontconfig");
 rtl::OString aConf = aBuffer.makeStringAndClear();
 sal_uInt64 aBytesWritten;
@@ -104,7 +112,8 @@ void CommonInitialize(int *argc, char ***argv)
 
 tools::extendApplicationEnvironment();
 
-Reference< XComponentContext > xContext = 
defaultBootstrap_InitialComponentContext();
+Reference< XComponentContext > xContext =
+defaultBootstrap_InitialComponentContext(sExecDir + 
getExecutableName() + ".unorc");
 Reference< XMultiServiceFactory > xServiceManager( 
xContext->getServiceManager(), UNO_QUERY );
 if( !xServiceManager.is() )
 Application::Abort( "Failed to bootstrap" );
diff --git a/vcl/workben/sftfuzzer.options b/vcl/workben/sftfuzzer.options
new file mode 100644
index ..678d526b1ea9
--- /dev/null
+++ b/vcl/workben/sftfuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 65536
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2018-02-23 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 508ac4c37e4980e0c96253f24469947911f931c0
Author: Caolán McNamara 
Date:   Fri Feb 23 11:50:07 2018 +

oss-fuzz: explicitly mention the rc files we want

Change-Id: Iabefbc3873b45f58fb8e493d043b0e08a3f425f9

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 29c591ca3d7f..99e90c937bb4 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -26,7 +26,7 @@ cp 
$SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf instdir/share/fon
 rm -rf $OUT/services $OUT/types $OUT/*rdb
 mkdir $OUT/services
 pushd instdir/program
-cp -r *fuzzer *rc types.rdb types $OUT
+cp -r *fuzzer unorc fundamentalrc types.rdb types $OUT
 head -c -14 services.rdb  > $OUT/services.rdb
 tail -c +85 ./services/services.rdb >> $OUT/services.rdb
 popd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh vcl/workben

2018-01-25 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh   |   13 +++--
 vcl/workben/602fuzzer.options   |2 ++
 vcl/workben/bmpfuzzer.options   |2 ++
 vcl/workben/cgmfuzzer.options   |2 ++
 vcl/workben/diffuzzer.options   |2 ++
 vcl/workben/docxfuzzer.options  |2 ++
 vcl/workben/dxffuzzer.options   |2 ++
 vcl/workben/epsfuzzer.options   |2 ++
 vcl/workben/fodpfuzzer.options  |3 +++
 vcl/workben/fodsfuzzer.options  |3 +++
 vcl/workben/fodtfuzzer.options  |3 +++
 vcl/workben/giffuzzer.options   |3 +++
 vcl/workben/htmlfuzzer.options  |3 +++
 vcl/workben/hwpfuzzer.options   |2 ++
 vcl/workben/jpgfuzzer.options   |3 +++
 vcl/workben/lwpfuzzer.options   |2 ++
 vcl/workben/metfuzzer.options   |2 ++
 vcl/workben/mmlfuzzer.options   |3 +++
 vcl/workben/mtpfuzzer.options   |2 ++
 vcl/workben/olefuzzer.options   |2 ++
 vcl/workben/pcdfuzzer.options   |2 ++
 vcl/workben/pctfuzzer.options   |2 ++
 vcl/workben/pcxfuzzer.options   |2 ++
 vcl/workben/pngfuzzer.options   |3 +++
 vcl/workben/ppmfuzzer.options   |2 ++
 vcl/workben/pptfuzzer.options   |2 ++
 vcl/workben/pptxfuzzer.options  |2 ++
 vcl/workben/psdfuzzer.options   |2 ++
 vcl/workben/qpwfuzzer.options   |2 ++
 vcl/workben/rasfuzzer.options   |2 ++
 vcl/workben/rtffuzzer.options   |2 ++
 vcl/workben/scrtffuzzer.options |2 ++
 vcl/workben/slkfuzzer.options   |2 ++
 vcl/workben/svmfuzzer.options   |2 ++
 vcl/workben/tgafuzzer.options   |2 ++
 vcl/workben/tiffuzzer.options   |3 +++
 vcl/workben/wksfuzzer.options   |2 ++
 vcl/workben/wmffuzzer.options   |2 ++
 vcl/workben/ww2fuzzer.options   |2 ++
 vcl/workben/ww6fuzzer.options   |2 ++
 vcl/workben/ww8fuzzer.options   |2 ++
 vcl/workben/xbmfuzzer.options   |2 ++
 vcl/workben/xlsfuzzer.options   |2 ++
 vcl/workben/xlsxfuzzer.options  |2 ++
 vcl/workben/xpmfuzzer.options   |2 ++
 45 files changed, 100 insertions(+), 10 deletions(-)

New commits:
commit c23d1d3efd5ec716525704d91b53ae07cb4c5458
Author: Caolán McNamara 
Date:   Thu Jan 25 17:12:14 2018 +

put a ceiling on various fuzzer input sizes

Change-Id: I7a53859377e6228542be50fd26af6b0d6701384c

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 10759eb31cd2..29c591ca3d7f 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -34,13 +34,6 @@ popd
 #starting corpuses
 cp $SRC/*_seed_corpus.zip $OUT
 #fuzzing dictionaries
-cp $SRC/gif.dict $OUT/giffuzzer.dict
-cp $SRC/jpeg.dict $OUT/jpgfuzzer.dict
-cp $SRC/png.dict $OUT/pngfuzzer.dict
-cp $SRC/tiff.dict $OUT/tiffuzzer.dict
-cp $SRC/xml.dict $OUT/fodtfuzzer.dict
-cp $SRC/xml.dict $OUT/fodsfuzzer.dict
-cp $SRC/xml.dict $OUT/fodpfuzzer.dict
-cp $SRC/xml.dict $OUT/fodgfuzzer.dict
-cp $SRC/xml.dict $OUT/mmlfuzzer.dict
-cp $SRC/html_tags.dict $OUT/htmlfuzzer.dict
+cp $SRC/*.dict $OUT
+#options files
+cp $SRC/libreoffice/vcl/workben/*.options $OUT
diff --git a/vcl/workben/602fuzzer.options b/vcl/workben/602fuzzer.options
new file mode 100644
index ..678d526b1ea9
--- /dev/null
+++ b/vcl/workben/602fuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 65536
diff --git a/vcl/workben/bmpfuzzer.options b/vcl/workben/bmpfuzzer.options
new file mode 100644
index ..678d526b1ea9
--- /dev/null
+++ b/vcl/workben/bmpfuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 65536
diff --git a/vcl/workben/cgmfuzzer.options b/vcl/workben/cgmfuzzer.options
new file mode 100644
index ..678d526b1ea9
--- /dev/null
+++ b/vcl/workben/cgmfuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 65536
diff --git a/vcl/workben/diffuzzer.options b/vcl/workben/diffuzzer.options
new file mode 100644
index ..678d526b1ea9
--- /dev/null
+++ b/vcl/workben/diffuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 65536
diff --git a/vcl/workben/docxfuzzer.options b/vcl/workben/docxfuzzer.options
new file mode 100644
index ..e8c2b812b01d
--- /dev/null
+++ b/vcl/workben/docxfuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 98304
diff --git a/vcl/workben/dxffuzzer.options b/vcl/workben/dxffuzzer.options
new file mode 100644
index ..678d526b1ea9
--- /dev/null
+++ b/vcl/workben/dxffuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 65536
diff --git a/vcl/workben/epsfuzzer.options b/vcl/workben/epsfuzzer.options
new file mode 100644
index ..678d526b1ea9
--- /dev/null
+++ b/vcl/workben/epsfuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 65536
diff --git a/vcl/workben/fodpfuzzer.options b/vcl/workben/fodpfuzzer.options
new file mode 100644
index ..76d308c39d0c
--- /dev/null
+++ b/vcl/workben/fodpfuzzer.options
@@ -0,0 +1,3 @@
+[libfuzzer]
+max_len = 65536
+dict = xml.dict
diff --git a/vcl/workben/fodsfuzzer.options b/vcl/workben/fodsfuzzer.options
new file mode 100644
index ..76d308c39d0c
--- /dev/null
+++

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-12-09 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab3c05f55d87984b8b5f9b9b329698cb9bdfb40b
Author: Caolán McNamara 
Date:   Sat Dec 9 19:33:44 2017 +

oss-fuzz hasn't merged this yet

Change-Id: I0b36af5d18d1b02b7d5193e610606c5d15f95ad0

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 10759eb31cd2..c9cb2f0f1b8f 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -43,4 +43,4 @@ cp $SRC/xml.dict $OUT/fodsfuzzer.dict
 cp $SRC/xml.dict $OUT/fodpfuzzer.dict
 cp $SRC/xml.dict $OUT/fodgfuzzer.dict
 cp $SRC/xml.dict $OUT/mmlfuzzer.dict
-cp $SRC/html_tags.dict $OUT/htmlfuzzer.dict
+#cp $SRC/html_tags.dict $OUT/htmlfuzzer.dict
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-12-08 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a126d37a90ebc2d94522c5bbbe64b288b87de7da
Author: Caolán McNamara 
Date:   Fri Dec 8 15:52:30 2017 +

use afl html_tags as htmlfuzzer dictionary

Change-Id: I5374c497f9d8f1a0616e123b503d2f9b642edc33
Reviewed-on: https://gerrit.libreoffice.org/46104
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 7c96a24b1469..10759eb31cd2 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -43,3 +43,4 @@ cp $SRC/xml.dict $OUT/fodsfuzzer.dict
 cp $SRC/xml.dict $OUT/fodpfuzzer.dict
 cp $SRC/xml.dict $OUT/fodgfuzzer.dict
 cp $SRC/xml.dict $OUT/mmlfuzzer.dict
+cp $SRC/html_tags.dict $OUT/htmlfuzzer.dict
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-12-02 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0cb20da5fddbfbeb06f51aef9cd5addb669bb2ad
Author: Caolán McNamara 
Date:   Sat Dec 2 17:41:11 2017 +

mml is an xml format too

Change-Id: I692aa11f32855e13795454bfebee45675e3f433a

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 1dd26028e203..7c96a24b1469 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -42,3 +42,4 @@ cp $SRC/xml.dict $OUT/fodtfuzzer.dict
 cp $SRC/xml.dict $OUT/fodsfuzzer.dict
 cp $SRC/xml.dict $OUT/fodpfuzzer.dict
 cp $SRC/xml.dict $OUT/fodgfuzzer.dict
+cp $SRC/xml.dict $OUT/mmlfuzzer.dict
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh bin/sanitize-blacklist.txt

2017-11-25 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh  |2 +-
 bin/sanitize-blacklist.txt |5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5efc05bf398ace1170b3e6e2276d79342f1f607a
Author: Caolán McNamara 
Date:   Sat Nov 25 15:55:18 2017 +

ofz#4424 black list the div by zero calc cases

Change-Id: I30d06e762901027a50586fcd17398d74ab349373
Reviewed-on: https://gerrit.libreoffice.org/45272
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 812d632316bd..1dd26028e203 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -7,7 +7,7 @@ fi
 
 #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
 #the CXX as the linker and need to pass -stdlib=libc++ to build
-export CXX="$CXX -stdlib=libc++"
+export CXX="$CXX -stdlib=libc++ 
-fsanitize-blacklist=$SRC/libreoffice/bin/sanitize-blacklist.txt"
 #similarly force the -fsanitize etc args in as well as pthread to get
 #things to link successfully during the build
 export LDFLAGS="$CFLAGS -lpthread"
diff --git a/bin/sanitize-blacklist.txt b/bin/sanitize-blacklist.txt
new file mode 100644
index ..7c97ff4abd51
--- /dev/null
+++ b/bin/sanitize-blacklist.txt
@@ -0,0 +1,5 @@
+[float-divide-by-zero]
+src:*/sc/source/core/tool/interpr1.cxx
+src:*/sc/source/core/tool/interpr2.cxx
+src:*/scaddins/source/analysis/analysis.cxx
+src:*/scaddins/source/analysis/financial.cxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-09-19 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f00ca5f26492a56378da0c7e54003419d8c7dd05
Author: Caolán McNamara 
Date:   Tue Sep 19 09:13:11 2017 +0100

prep for other flat xml formats

Change-Id: Ib2aa62f06f8b8a69b4dfbea5a1137aede18f6b78
Reviewed-on: https://gerrit.libreoffice.org/42458
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index eafdd0f9d467..812d632316bd 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -39,3 +39,6 @@ cp $SRC/jpeg.dict $OUT/jpgfuzzer.dict
 cp $SRC/png.dict $OUT/pngfuzzer.dict
 cp $SRC/tiff.dict $OUT/tiffuzzer.dict
 cp $SRC/xml.dict $OUT/fodtfuzzer.dict
+cp $SRC/xml.dict $OUT/fodsfuzzer.dict
+cp $SRC/xml.dict $OUT/fodpfuzzer.dict
+cp $SRC/xml.dict $OUT/fodgfuzzer.dict
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-09-18 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 7654183a53cd221e54a10a1bf5497df0c788860d
Author: Caolán McNamara 
Date:   Sun Sep 17 21:18:00 2017 +0100

ofz: add dicts to outdir

Change-Id: I426fa26daac9caa63541099f40183d080dd70cc5
Reviewed-on: https://gerrit.libreoffice.org/42430
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 577d73753a0d..eafdd0f9d467 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -33,3 +33,9 @@ popd
 
 #starting corpuses
 cp $SRC/*_seed_corpus.zip $OUT
+#fuzzing dictionaries
+cp $SRC/gif.dict $OUT/giffuzzer.dict
+cp $SRC/jpeg.dict $OUT/jpgfuzzer.dict
+cp $SRC/png.dict $OUT/pngfuzzer.dict
+cp $SRC/tiff.dict $OUT/tiffuzzer.dict
+cp $SRC/xml.dict $OUT/fodtfuzzer.dict
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-07-30 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 569ae950f728c658be559d44932a0622df3ed268
Author: Caolán McNamara 
Date:   Sun Jul 30 21:13:03 2017 +0100

ofz: resource dir no longer needed

Change-Id: I447d48930d3321f5c3e1aab9f7b04299cc75f6bb

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index b0d3d6eb201a..642e478fdbd2 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -23,14 +23,11 @@ make fuzzers
 #some minimal fonts required
 cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
instdir/share/fonts/truetype/Liberation* $OUT
 #minimal runtime requirements
-rm -rf $OUT/services $OUT/types $OUT/resource $OUT/*rdb
-pushd instdir
-cp -r resource $OUT
-pushd program
+rm -rf $OUT/services $OUT/types $OUT/*rdb
+pushd instdir/program
 cp -r *fuzzer *rc *rdb services types $OUT
 mv $OUT/services/services.rdb $OUT/services.rdb
 popd
-popd
 
 #starting corpuses
 cp $SRC/*_seed_corpus.zip $OUT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-04-19 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 81b512f3ef39c448b34f7cf52832be883d9ebd0c
Author: Caolán McNamara 
Date:   Wed Apr 19 11:47:45 2017 +0100

maybe oss-fuzz shares /work and /out

currently the build runs out of space

Change-Id: I24a68051b7fd1df7c55849f27aa43cedc9909b1a
Reviewed-on: https://gerrit.libreoffice.org/36682
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index b0d3d6eb201a..e9972578ff93 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -20,6 +20,8 @@ export ASAN_OPTIONS="detect_leaks=0"
 
 make fuzzers
 
+rm -rf workdir
+
 #some minimal fonts required
 cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
instdir/share/fonts/truetype/Liberation* $OUT
 #minimal runtime requirements
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh configure.ac

2017-03-09 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |7 +--
 configure.ac  |6 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 3b7054e0bb86cec2db08b7c7654710a21cf66a94
Author: Caolán McNamara 
Date:   Thu Mar 9 10:24:22 2017 +

use a different resource dir for oss-fuzz

This reverts commit 754854674859560506b617ebf07e6563c197aac8.

Change-Id: I0863fb5e34608911c784bbdf19e76297b3c2d13e

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 2c54e13..b0d3d6e 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -24,10 +24,13 @@ make fuzzers
 cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
instdir/share/fonts/truetype/Liberation* $OUT
 #minimal runtime requirements
 rm -rf $OUT/services $OUT/types $OUT/resource $OUT/*rdb
-pushd instdir/program
-cp -r *fuzzer *rc *rdb services types resource $OUT
+pushd instdir
+cp -r resource $OUT
+pushd program
+cp -r *fuzzer *rc *rdb services types $OUT
 mv $OUT/services/services.rdb $OUT/services.rdb
 popd
+popd
 
 #starting corpuses
 cp $SRC/*_seed_corpus.zip $OUT
diff --git a/configure.ac b/configure.ac
index fb4441c..dd945c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3129,7 +3129,11 @@ else
 LIBO_SHARE_JAVA_FOLDER=program/classes
 LIBO_SHARE_PRESETS_FOLDER=presets
 LIBO_SHARE_READMES_FOLDER=readmes
-LIBO_SHARE_RESOURCE_FOLDER=program/resource
+if test "$enable_fuzzers" != yes; then
+LIBO_SHARE_RESOURCE_FOLDER=program/resource
+else
+LIBO_SHARE_RESOURCE_FOLDER=resource
+fi
 LIBO_SHARE_SHELL_FOLDER=program/shell
 LIBO_URE_BIN_FOLDER=program
 LIBO_URE_ETC_FOLDER=program
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-03-09 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9e4f6531bf0ae8b375127a189e87c1ebc99508ac
Author: Caolán McNamara 
Date:   Thu Mar 9 11:09:50 2017 +

report that we export certain vars to be set

Change-Id: I3a71542da943a689ab734507c811087caa427a1c

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index c4084b5..2c54e13 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -1,4 +1,9 @@
-#!/bin/bash -eu
+#!/bin/bash -e
+
+if [ -z "${OUT}" ] || [ -z "${SRC}" ] || [ -z "${WORK}" ]; then
+echo "OUT, SRC or WORK not set - script expects to be called inside 
oss-fuzz build env"
+exit 1
+fi
 
 #shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
 #the CXX as the linker and need to pass -stdlib=libc++ to build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-03-09 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |   28 
 1 file changed, 28 insertions(+)

New commits:
commit ec01a46ea3520f9086d0ce6fae05f763ce5cb533
Author: Caolán McNamara 
Date:   Thu Mar 9 10:23:54 2017 +

put the oss build script into our own git

Change-Id: Ifeabee60c18afa88403e1c92d01a01b545ed6570

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
new file mode 100755
index 000..c4084b5
--- /dev/null
+++ b/bin/oss-fuzz-build.sh
@@ -0,0 +1,28 @@
+#!/bin/bash -eu
+
+#shuffle CXXFLAGS -stdlib=libc++ arg into CXX as well because we use
+#the CXX as the linker and need to pass -stdlib=libc++ to build
+export CXX="$CXX -stdlib=libc++"
+#similarly force the -fsanitize etc args in as well as pthread to get
+#things to link successfully during the build
+export LDFLAGS="$CFLAGS -lpthread"
+
+cd $WORK
+$SRC/libreoffice/autogen.sh --with-distro=LibreOfficeOssFuzz 
--with-external-tar=$SRC
+
+#build-time rsc tool leaks a titch
+export ASAN_OPTIONS="detect_leaks=0"
+
+make fuzzers
+
+#some minimal fonts required
+cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
instdir/share/fonts/truetype/Liberation* $OUT
+#minimal runtime requirements
+rm -rf $OUT/services $OUT/types $OUT/resource $OUT/*rdb
+pushd instdir/program
+cp -r *fuzzer *rc *rdb services types resource $OUT
+mv $OUT/services/services.rdb $OUT/services.rdb
+popd
+
+#starting corpuses
+cp $SRC/*_seed_corpus.zip $OUT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits