[Libreoffice-commits] core.git: distro-configs/LibreOfficeOssFuzz.conf Makefile.in Repository.mk vcl/commonfuzzer.mk vcl/Executable_dbffuzzer.mk vcl/Module_vcl.mk vcl/workben

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sat Sep 25 18:26:04 UTC 2021


 Makefile.in                            |    2 -
 Repository.mk                          |    1 
 distro-configs/LibreOfficeOssFuzz.conf |    2 -
 vcl/Executable_dbffuzzer.mk            |   50 +++++++++++++++++++++++++++++++
 vcl/Module_vcl.mk                      |    1 
 vcl/commonfuzzer.mk                    |    3 +
 vcl/workben/dbffuzzer.cxx              |   53 +++++++++++++++++++++++++++++++++
 vcl/workben/dbffuzzer.options          |    2 +
 8 files changed, 112 insertions(+), 2 deletions(-)

New commits:
commit eb5de6c3620e7207e473b6e932f1902103d2a35d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 24 13:50:16 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Sep 25 20:25:30 2021 +0200

    add dbffuzzer
    
    which requires dropping ---disable-database-connectivity
    
    Change-Id: I5b3a2027916a3cf844cefd90629c3fe918ead31e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122591
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index e7f614698515..4fdfe067ebf5 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 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
+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 Library
 _file 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 Executable_dbffuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/Repository.mk b/Repository.mk
index c19e3f264250..9aacc0dba7fb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -142,6 +142,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
 	$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
+	$(call gb_Helper_optional,FUZZERS,dbffuzzer) \
 	$(if $(filter-out ANDROID HAIKU iOS MACOSX WNT,$(OS)),oosplash) \
 	soffice_bin \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/distro-configs/LibreOfficeOssFuzz.conf b/distro-configs/LibreOfficeOssFuzz.conf
index 410426c166b7..3cbc663467e1 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -2,7 +2,6 @@
 --enable-ld=gold
 --disable-dynamic-loading
 --disable-runtime-optimizations
---disable-database-connectivity
 --disable-scripting
 --disable-cairo-canvas
 --disable-cmis
@@ -17,6 +16,7 @@
 --disable-ldap
 --disable-librelogo
 --disable-lpsolve
+--disable-mariadb-sdbc
 --disable-odk
 --disable-pdfimport
 --disable-pdfium
diff --git a/vcl/Executable_dbffuzzer.mk b/vcl/Executable_dbffuzzer.mk
new file mode 100644
index 000000000000..72478ee2e2ec
--- /dev/null
+++ b/vcl/Executable_dbffuzzer.mk
@@ -0,0 +1,50 @@
+# -*- 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,dbffuzzer))
+
+$(eval $(call gb_Executable_use_api,dbffuzzer,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,dbffuzzer,\
+	$(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,dbffuzzer,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,dbffuzzer,\
+    $(fuzzer_calc_libraries) \
+    $(fuzzer_core_libraries) \
+    pdffilter \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,dbffuzzer,\
+    findsofficepath \
+    ulingu \
+    fuzzer_calc \
+    fuzzerstubs \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,dbffuzzer,\
+	vcl/workben/dbffuzzer \
+))
+
+$(eval $(call gb_Executable_add_libs,dbffuzzer,\
+	$(LIB_FUZZING_ENGINE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 41eb63456470..00d7e8deef63 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -185,6 +185,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
     Executable_mtpfuzzer \
     Executable_htmlfuzzer \
     Executable_sftfuzzer \
+    Executable_dbffuzzer \
 ))
 endif
 
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index ee7fe1ad95d6..8688894f544f 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -55,12 +55,14 @@ fuzzer_core_libraries = \
     cppcanvas \
     ctl \
     dba \
+    dbase \
     dbtools \
     deployment \
     deploymentmisc \
     drawinglayer \
     editeng \
     emfio \
+    file \
     filterconfig \
     fsstorage \
     fwk \
@@ -73,6 +75,7 @@ fuzzer_core_libraries = \
     package2 \
     sax \
     sb \
+    sdbc2 \
     $(call gb_Helper_optional,SCRIPTING, \
         scriptframe) \
     spell \
diff --git a/vcl/workben/dbffuzzer.cxx b/vcl/workben/dbffuzzer.cxx
new file mode 100644
index 000000000000..e3edfff7dd9e
--- /dev/null
+++ b/vcl/workben/dbffuzzer.cxx
@@ -0,0 +1,53 @@
+/* -*- 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 <com/sun/star/ucb/XContentProvider.hpp>
+#include <com/sun/star/ucb/XUniversalContentBroker.hpp>
+#include "commonfuzzer.hxx"
+
+extern "C" void* ScCreateDialogFactory() { return nullptr; }
+
+extern "C" bool TestImportDBF(SvStream& rStream);
+
+extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
+{
+    if (__lsan_disable)
+        __lsan_disable();
+
+    CommonInitialize(argc, argv);
+
+    // initialise unconfigured UCB:
+    css::uno::Reference<css::ucb::XUniversalContentBroker> xUcb(
+        comphelper::getProcessServiceFactory()->createInstance(
+            "com.sun.star.ucb.UniversalContentBroker"),
+        css::uno::UNO_QUERY_THROW);
+    css::uno::Sequence<css::uno::Any> aArgs(1);
+    aArgs[0] <<= OUString("NoConfig");
+    css::uno::Reference<css::ucb::XContentProvider> xFileProvider(
+        comphelper::getProcessServiceFactory()->createInstanceWithArguments(
+            "com.sun.star.ucb.FileContentProvider", aArgs),
+        css::uno::UNO_QUERY_THROW);
+    xUcb->registerContentProvider(xFileProvider, "file", true);
+
+    if (__lsan_enable)
+        __lsan_enable();
+
+    return 0;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    SvMemoryStream aStream(const_cast<uint8_t*>(data), size, StreamMode::READ);
+    (void)TestImportDBF(aStream);
+    return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/workben/dbffuzzer.options b/vcl/workben/dbffuzzer.options
new file mode 100644
index 000000000000..678d526b1ea9
--- /dev/null
+++ b/vcl/workben/dbffuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 65536


More information about the Libreoffice-commits mailing list