diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rwxr-xr-x | solenv/bin/native-code.py | 12 | ||||
| -rw-r--r-- | vcl/CustomTarget_nativemath.mk | 18 | ||||
| -rw-r--r-- | vcl/Executable_mmlfuzzer.mk | 49 | ||||
| -rw-r--r-- | vcl/Module_vcl.mk | 3 | ||||
| -rw-r--r-- | vcl/StaticLibrary_fuzzer_math.mk | 25 | ||||
| -rw-r--r-- | vcl/commonfuzzer.mk | 3 | ||||
| -rw-r--r-- | vcl/workben/mmlfuzzer.cxx | 33 |
9 files changed, 145 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 004d1007f371..78658cd84caa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -483,7 +483,7 @@ $(foreach ide,\ eclipsecdt,\ $(eval $(call gb_Top_GbuildToIdeIntegration,$(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 Executable_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 Executable_fodsfuzzer Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer Executable_pptxfuzzer +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 StaticLibrary_fuzzer_math Library_forui Library_binaryurp Library_io Library_invocation Library_namingservice Library_proxyfac Library_uuresolver Module_ure Executable_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 Executable_fodsfuzzer Executable_fodpfuzzer Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer Executable_pptxfuzzer Executable_mmlfuzzer endif # MAKE_RESTARTS diff --git a/Repository.mk b/Repository.mk index bf86319025f4..b2714c5f6e22 100644 --- a/Repository.mk +++ b/Repository.mk @@ -140,6 +140,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,docxfuzzer) \ $(call gb_Helper_optional,FUZZERS,xlsxfuzzer) \ $(call gb_Helper_optional,FUZZERS,pptxfuzzer) \ + $(call gb_Helper_optional,FUZZERS,mmlfuzzer) \ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ soffice_bin \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 430a429e9b6d..1fbc0ae98884 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -269,6 +269,16 @@ edit_constructor_list = [ "com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation", ] +# math +math_factory_list = [ + ] + +math_constructor_list = [ +# starmath/util/sm.component + "Math_XMLOasisMetaExporter_get_implementation", + "Math_XMLOasisSettingsExporter_get_implementation", + ] + calc_factory_list = [ ("libsclo.a", "sc_component_getFactory"), ("libanalysislo.a", "analysis_component_getFactory"), @@ -352,6 +362,7 @@ writer_constructor_list = [ factory_map = { 'core' : core_factory_list, 'edit' : edit_factory_list, + 'math' : math_factory_list, 'calc' : calc_factory_list, 'draw' : draw_factory_list, 'writer' : writer_factory_list, @@ -360,6 +371,7 @@ factory_map = { constructor_map = { 'core' : core_constructor_list, 'edit' : edit_constructor_list, + 'math' : math_constructor_list, 'calc' : calc_constructor_list, 'draw' : draw_constructor_list, 'writer' : writer_constructor_list, diff --git a/vcl/CustomTarget_nativemath.mk b/vcl/CustomTarget_nativemath.mk new file mode 100644 index 000000000000..7465378c184f --- /dev/null +++ b/vcl/CustomTarget_nativemath.mk @@ -0,0 +1,18 @@ +# +# 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/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,vcl/workben)) + +fuzzer_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python) + +fuzzer_Native_cxx=$(call gb_CustomTarget_get_workdir,vcl/workben)/native-math.cxx + +$(fuzzer_Native_cxx): $(SRCDIR)/solenv/bin/native-code.py | $(call gb_CustomTarget_get_workdir,vcl/workben)/.dir + $(call gb_Helper_abbreviate_dirs, $(fuzzer_PYTHONCOMMAND) $(SRCDIR)/solenv/bin/native-code.py -g core -g math) > $@ + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Executable_mmlfuzzer.mk b/vcl/Executable_mmlfuzzer.mk new file mode 100644 index 000000000000..a8f945c44972 --- /dev/null +++ b/vcl/Executable_mmlfuzzer.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,mmlfuzzer)) + +$(eval $(call gb_Executable_use_api,mmlfuzzer,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Executable_use_externals,mmlfuzzer,\ + $(fuzzer_externals) \ +)) + +$(eval $(call gb_Executable_set_include,mmlfuzzer,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_Executable_use_libraries,mmlfuzzer,\ + $(fuzzer_math_libraries) \ + $(fuzzer_core_libraries) \ +)) + +$(eval $(call gb_Executable_use_static_libraries,mmlfuzzer,\ + findsofficepath \ + ulingu \ + fuzzer_math \ + fuzzerstubs \ +)) + +$(eval $(call gb_Executable_add_exception_objects,mmlfuzzer,\ + vcl/workben/mmlfuzzer \ +)) + +$(eval $(call gb_Executable_add_libs,mmlfuzzer,\ + -lFuzzingEngine \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 72267afdc5ad..ed6cfe96ba4e 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -113,11 +113,13 @@ $(eval $(call gb_Module_add_targets,vcl,\ CustomTarget_nativecalc \ CustomTarget_nativedraw \ CustomTarget_nativewriter \ + CustomTarget_nativemath \ StaticLibrary_fuzzerstubs \ StaticLibrary_fuzzer_core \ StaticLibrary_fuzzer_calc \ StaticLibrary_fuzzer_draw \ StaticLibrary_fuzzer_writer \ + StaticLibrary_fuzzer_math \ Executable_wmffuzzer \ Executable_jpgfuzzer \ Executable_giffuzzer \ @@ -159,6 +161,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ Executable_docxfuzzer \ Executable_xlsxfuzzer \ Executable_pptxfuzzer \ + Executable_mmlfuzzer \ )) endif diff --git a/vcl/StaticLibrary_fuzzer_math.mk b/vcl/StaticLibrary_fuzzer_math.mk new file mode 100644 index 000000000000..ba5d03889a83 --- /dev/null +++ b/vcl/StaticLibrary_fuzzer_math.mk @@ -0,0 +1,25 @@ +# -*- 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/. + +$(eval $(call gb_StaticLibrary_StaticLibrary,fuzzer_math)) + +$(eval $(call gb_StaticLibrary_set_include,fuzzer_math,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_StaticLibrary_use_api,fuzzer_math,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,fuzzer_math,\ + CustomTarget/vcl/workben/native-math \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk index 7581cf3e6761..e91fa353d1e5 100644 --- a/vcl/commonfuzzer.mk +++ b/vcl/commonfuzzer.mk @@ -158,3 +158,6 @@ fuzzer_draw_libraries = \ sd \ sdd \ icg \ + +fuzzer_math_libraries = \ + sm \ diff --git a/vcl/workben/mmlfuzzer.cxx b/vcl/workben/mmlfuzzer.cxx new file mode 100644 index 000000000000..675b22ee5284 --- /dev/null +++ b/vcl/workben/mmlfuzzer.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 TestImportMML(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)TestImportMML(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: */ |