[Libreoffice-commits] core.git: Makefile.in Repository.mk vcl/Executable_htmlfuzzer.mk vcl/Module_vcl.mk vcl/workben
Caolán McNamara
caolanm at redhat.com
Wed Dec 20 17:31:54 UTC 2017
Makefile.in | 2 -
Repository.mk | 1
vcl/Executable_htmlfuzzer.mk | 49 -------------------------------------------
vcl/Module_vcl.mk | 1
vcl/workben/htmlfuzzer.cxx | 33 ----------------------------
5 files changed, 1 insertion(+), 85 deletions(-)
New commits:
commit 111db5b992ae5870e76313f76e633a4edcccf010
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 20 17:30:58 2017 +0000
remove html fuzzer
still not ready after all
This reverts commit 6fc7f85de7f0bfa8ee36f867e321a8816ad1e385.
diff --git a/Makefile.in b/Makefile.in
index 8c777a67f4ee..9ac31060e27f 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 Rdb_services udkapi offapi 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 Execu
table_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 Executable_mtpfuzzer Executable_htmlfuzzer
+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 Rdb_services udkapi offapi 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 Execu
table_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 Executable_mtpfuzzer
endif # MAKE_RESTARTS
diff --git a/Repository.mk b/Repository.mk
index cc540ef4139e..4e9728adc5c6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -142,7 +142,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,pptxfuzzer) \
$(call gb_Helper_optional,FUZZERS,mmlfuzzer) \
$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
- $(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_htmlfuzzer.mk b/vcl/Executable_htmlfuzzer.mk
deleted file mode 100644
index 426eee442e10..000000000000
--- a/vcl/Executable_htmlfuzzer.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- 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,htmlfuzzer))
-
-$(eval $(call gb_Executable_use_api,htmlfuzzer,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Executable_use_externals,htmlfuzzer,\
- $(fuzzer_externals) \
-))
-
-$(eval $(call gb_Executable_set_include,htmlfuzzer,\
- $$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
-))
-
-$(eval $(call gb_Executable_use_libraries,htmlfuzzer,\
- $(fuzzer_writer_libraries) \
- $(fuzzer_core_libraries) \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,htmlfuzzer,\
- findsofficepath \
- ulingu \
- fuzzer_writer \
- fuzzerstubs \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,htmlfuzzer,\
- vcl/workben/htmlfuzzer \
-))
-
-$(eval $(call gb_Executable_add_libs,htmlfuzzer,\
- -lFuzzingEngine \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 91fcbba026d7..176c061af8f5 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -163,7 +163,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
Executable_pptxfuzzer \
Executable_mmlfuzzer \
Executable_mtpfuzzer \
- Executable_htmlfuzzer \
))
endif
diff --git a/vcl/workben/htmlfuzzer.cxx b/vcl/workben/htmlfuzzer.cxx
deleted file mode 100644
index 7acbf1eb2881..000000000000
--- a/vcl/workben/htmlfuzzer.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- 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 TestImportHTML(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)TestImportHTML(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: */
More information about the Libreoffice-commits
mailing list