Makefile.in | 2 Repository.mk | 1 external/jpeg-turbo/ExternalProject_jpeg-turbo.mk | 1 sd/source/filter/ppt/pptin.cxx | 7 +-- vcl/Executable_pptfuzzer.mk | 47 ++++++++++++++++++++++ vcl/Module_vcl.mk | 1 vcl/source/gdi/gfxlink.cxx | 12 ++--- vcl/workben/fftester.cxx | 7 +-- vcl/workben/pptfuzzer.cxx | 23 ++++++++++ 9 files changed, 87 insertions(+), 14 deletions(-)
New commits: commit 924fc2702e27ffc59012ddaccd210e9eef6912e6 Author: Caolán McNamara <[email protected]> Date: Wed Mar 15 13:43:17 2017 +0000 try and fix arm cross compilation Change-Id: Id18f7254f9476bf12f24db662b8beed323ff7546 diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk index f3affa1..9e03304 100644 --- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk +++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk @@ -26,6 +26,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) : $(call gb_ExternalProject_run,configure,\ MAKE=$(MAKE) ./configure \ --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ + $(if $(CROSS_COMPILING),--host=$(HOST_PLATFORM)) \ --with-pic \ --enable-static \ --disable-shared \ commit f5bfdb06e3a14e0a754d09690a323a6f8ba3f0fa Author: Caolán McNamara <[email protected]> Date: Thu Mar 2 14:41:46 2017 +0000 add ppt fuzzer Change-Id: I283d24fc2d7420273c3769fcd4ea3938da85afb4 diff --git a/Makefile.in b/Makefile.in index bc5285b..87b4e97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -446,7 +446,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_fuzzer 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 AllLangResTarget_sd +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_fuzzer 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 AllLangResTarget_sd Executable_pptfuzzer endif # MAKE_RESTARTS diff --git a/Repository.mk b/Repository.mk index 391d8bb..0c8dc9a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -116,6 +116,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,602fuzzer) \ $(call gb_Helper_optional,FUZZERS,lwpfuzzer) \ $(call gb_Helper_optional,FUZZERS,olefuzzer) \ + $(call gb_Helper_optional,FUZZERS,pptfuzzer) \ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ soffice_bin \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 2cf2a13..c82788d 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2760,10 +2760,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( return bRet; } -extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPT(const OUString &rURL) +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPT(SvStream &rStream) { - SvFileStream aFileStream(rURL, StreamMode::READ); - tools::SvRef<SotStorage> xStorage(new SotStorage(aFileStream)); + tools::SvRef<SotStorage> xStorage(new SotStorage(rStream)); if (xStorage->GetError()) return false; @@ -2773,7 +2772,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportPPT(const OUString &rURL SdDLL::Init(); - SfxMedium aSrcMed(rURL, StreamMode::STD_READ); + SfxMedium aSrcMed("", StreamMode::STD_READ); xDocStream->SetVersion(xStorage->GetVersion()); xDocStream->SetCryptMaskKey(xStorage->GetKey()); diff --git a/vcl/Executable_pptfuzzer.mk b/vcl/Executable_pptfuzzer.mk new file mode 100644 index 0000000..fc3cca2 --- /dev/null +++ b/vcl/Executable_pptfuzzer.mk @@ -0,0 +1,47 @@ +# -*- 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,pptfuzzer)) + +$(eval $(call gb_Executable_use_api,pptfuzzer,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Executable_use_externals,pptfuzzer,\ + $(fuzzer_externals) \ +)) + +$(eval $(call gb_Executable_set_include,pptfuzzer,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_Executable_use_libraries,pptfuzzer,\ + $(fuzzer_libraries) \ +)) + +$(eval $(call gb_Executable_use_static_libraries,pptfuzzer,\ + findsofficepath \ + ulingu \ + fuzzer \ +)) + +$(eval $(call gb_Executable_add_exception_objects,pptfuzzer,\ + vcl/workben/pptfuzzer \ +)) + +$(eval $(call gb_Executable_add_libs,pptfuzzer,\ + -lFuzzingEngine \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index ca1a12e..52f93e0 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -129,6 +129,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ Executable_602fuzzer \ Executable_lwpfuzzer \ Executable_olefuzzer \ + Executable_pptfuzzer \ )) endif diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index c7857a8..1007d23 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -448,16 +448,17 @@ try_again: } else if (strcmp(argv[2], "ppt") == 0) { - static HFilterCall pfnImport(nullptr); + static FFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; aLibrary.loadRelative(&thisModule, "libsdfiltlo.so", SAL_LOADMODULE_LAZY); - pfnImport = reinterpret_cast<HFilterCall>( + pfnImport = reinterpret_cast<FFilterCall>( aLibrary.getFunctionSymbol("TestImportPPT")); aLibrary.release(); } - ret = (int) (*pfnImport)(out); + SvFileStream aFileStream(out, StreamMode::READ); + ret = (int) (*pfnImport)(aFileStream); } #endif } diff --git a/vcl/workben/pptfuzzer.cxx b/vcl/workben/pptfuzzer.cxx new file mode 100644 index 0000000..8c93453 --- /dev/null +++ b/vcl/workben/pptfuzzer.cxx @@ -0,0 +1,23 @@ +/* -*- 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 TestImportPPT(SvStream &rStream); + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + SvMemoryStream aStream(const_cast<uint8_t*>(data), size, StreamMode::READ); + (void)TestImportPPT(aStream); + return 0; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 4af16b2f00c3d7d5c48f65aeff2c34fff3942ada Author: Caolán McNamara <[email protected]> Date: Wed Mar 15 11:28:15 2017 +0000 utl::TempFile can give a stream directly without bringing ucb into it Change-Id: Ic6eb0934fdb63492d831b9dad07e93c968ee9bf2 diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index abe94b0..60d6493 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -141,15 +141,15 @@ void GfxLink::SwapOut() OUString aURL = aTempFile.GetURL(); - if( !aURL.isEmpty() ) + if (!aURL.isEmpty()) { std::shared_ptr<GfxLink::SwapOutData> pSwapOut = std::make_shared<SwapOutData>(aURL); // aURL is removed in the destructor - std::unique_ptr<SvStream> xOStm(::utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE )); - if( xOStm ) + SvStream* pOStm = aTempFile.GetStream(StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE); + if (pOStm) { - xOStm->WriteBytes( mpSwapInData.get(), mnSwapInDataSize ); - bool bError = ( ERRCODE_NONE != xOStm->GetError() ); - xOStm.reset(); + pOStm->WriteBytes(mpSwapInData.get(), mnSwapInDataSize); + bool bError = (ERRCODE_NONE != pOStm->GetError()); + aTempFile.CloseStream(); if( !bError ) {
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
