[Libreoffice-commits] core.git: 2 commits - distro-configs/LibreOfficeOssFuzz.conf vcl/workben

[Caolán McNamara]

 distro-configs/LibreOfficeOssFuzz.conf |    1 +
 vcl/workben/fftester.cxx               |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit ed8ecae06dae4775a2610edc6bcc96a91fb60147
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 10 21:17:31 2016 +0000

    oss-fuzz: do explicit disable-runtime-optimizations
    
    Change-Id: I0597436bddcd79f7a44d3969b54a3ae2e02b3c70

diff --git a/distro-configs/LibreOfficeOssFuzz.conf b/distro-configs/LibreOfficeOssFuzz.conf
index cf911a6..95e8bfc 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -1,4 +1,5 @@
 --enable-fuzzers
+--disable-runtime-optimizations
 --disable-gui
 --disable-gtk
 --disable-gtk3
commit 35e1edf27b2296778d4bff190be63a9c3a718629
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 10 21:17:02 2016 +0000

    handle DISABLE_DYNLOADING case for fftester
    
    just to build it, needs a bit of love for runtime cases I suppose
    
    Change-Id: I9f5d4e4012e0addc8173f126fc93a2ec3eb9de45

diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 624547a..e6a0ba6 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -62,7 +62,9 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace cppu;
 
+#ifndef DISABLE_DYNLOADING
 extern "C" { static void SAL_CALL thisModule() {} }
+#endif
 
 typedef bool (*WFilterCall)(const OUString &rUrl, const OUString &rFlt);
 typedef bool (*HFilterCall)(const OUString &rUrl);
@@ -162,6 +164,7 @@ try_again:
                 SvFileStream aFileStream(out, StreamMode::READ);
                 ReadGDIMetaFile(aFileStream, aGDIMetaFile);
             }
+#ifndef DISABLE_DYNLOADING
             else if (strcmp(argv[2], "pcd") == 0)
             {
                 static PFilterCall pfnImport(nullptr);
@@ -449,6 +452,7 @@ try_again:
                 }
                 ret = (int) (*pfnImport)(out);
             }
+#endif
         }
 
         /* To signal successful completion of a run, we need to deliver