Makefile.in | 2 -
Repository.mk | 1
vcl/Executable_fodtfuzzer.mk | 49 +++++++++++++++++++++++++++++++++++++++++++
vcl/Module_vcl.mk | 1
vcl/workben/fodtfuzzer.cxx | 33 ++++++++++++++++++++++++++++
5 files changed, 85 insertions(+), 1 deletion(-)
New commits:
commit a34bb5d4325da8ee359acfa493bd8b2d0a9b0c8c
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Sep 19 09:04:26 2017 +0100
expose fodt to oss-fuzz
Change-Id: Ifdc71fc4a1defbd5c07b93c844a8ccaa055969aa
Reviewed-on: https://gerrit.libreoffice.org/42451
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/Makefile.in b/Makefile.in
index 04aa28a8cd6c..1de5c22ef17d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -475,7 +475,7 @@ $(foreach ide,\
eclipsecdt,\
$(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide))))
-fuzzers: 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_deploymentmisc Library_editeng
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi
Library_clew Library_gie 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 Library_forui
Library_binaryurp Library_io Library_invocation Library_namingservice
Library_proxyfac Library_uuresolver Module_ure Exe
cutable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer
Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer
Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer
Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer
Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer
Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer
Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer
Executable_slkfuzzer
+fuzzers: 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_deploymentmisc Library_editeng
Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax
Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi
Library_clew Library_gie 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 Library_forui
Library_binaryurp Library_io Library_invocation Library_namingservice
Library_proxyfac Library_uuresolver Module_ure Exe
cutable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer
Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer
Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer
Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer
Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer
Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer
Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer
Executable_slkfuzzer Executable_fodtfuzzer
endif # MAKE_RESTARTS
diff --git a/Repository.mk b/Repository.mk
index 623e956bd282..145e533c6621 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -130,6 +130,7 @@ $(eval $(call
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,ww8fuzzer) \
$(call gb_Helper_optional,FUZZERS,qpwfuzzer) \
$(call gb_Helper_optional,FUZZERS,slkfuzzer) \
+ $(call gb_Helper_optional,FUZZERS,fodtfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_fodtfuzzer.mk b/vcl/Executable_fodtfuzzer.mk
new file mode 100644
index 000000000000..3a78987f9dc2
--- /dev/null
+++ b/vcl/Executable_fodtfuzzer.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+include $(SRCDIR)/vcl/commonfuzzer.mk
+
+$(eval $(call gb_Executable_Executable,fodtfuzzer))
+
+$(eval $(call gb_Executable_use_api,fodtfuzzer,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,fodtfuzzer,\
+ $(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,fodtfuzzer,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,fodtfuzzer,\
+ $(fuzzer_writer_libraries) \
+ $(fuzzer_core_libraries) \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,fodtfuzzer,\
+ findsofficepath \
+ ulingu \
+ fuzzer_writer \
+ fuzzerstubs \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,fodtfuzzer,\
+ vcl/workben/fodtfuzzer \
+))
+
+$(eval $(call gb_Executable_add_libs,fodtfuzzer,\
+ -lFuzzingEngine \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 086328dbf466..0906aab42b33 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -137,6 +137,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Executable_ww8fuzzer \
Executable_qpwfuzzer \
Executable_slkfuzzer \
+ Executable_fodtfuzzer \
))
endif
diff --git a/vcl/workben/fodtfuzzer.cxx b/vcl/workben/fodtfuzzer.cxx
new file mode 100644
index 000000000000..b881c6af2157
--- /dev/null
+++ b/vcl/workben/fodtfuzzer.cxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <tools/stream.hxx>
+#include <vcl/FilterConfigItem.hxx>
+#include "commonfuzzer.hxx"
+
+extern "C" bool TestImportFODT(SvStream &rStream);
+
+extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
+{
+ TypicalFuzzerInitialize(argc, argv);
+ return 0;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+ SvMemoryStream aStream(const_cast<uint8_t*>(data), size, StreamMode::READ);
+ (void)TestImportFODT(aStream);
+ //fontconfigs alloc mechanism is too complicated for lsan/valgrind so
+ //force the fontconfig options to be released now, they are demand loaded
+ //so will be recreated if necessary
+ SvpSalGraphics::getPlatformGlyphCache().ClearFontOptions();
+ return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
