From 1c364b96d3923a0b48b6494d002da45cd0a1e270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 12 Jan 2017 11:25:24 +0000 Subject: [PATCH] add ppm/pbm fuzzer Change-Id: I6f403570abcf50be4cf11f20ea52bb2a07367b2a --- Makefile.in | 2 +- Repository.mk | 1 + vcl/Executable_ppmfuzzer.mk | 47 +++++++++++++++++++++++++++++++++++++ vcl/Module_vcl.mk | 1 + vcl/workben/ppmfuzzer.cxx | 24 +++++++++++++++++++ 5 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 vcl/Executable_ppmfuzzer.mk create mode 100644 vcl/workben/ppmfuzzer.cxx diff --git a/Makefile.in b/Makefile.in index dc7504004ba4..f052ced79f79 100644 --- a/Makefile.in +++ b/Makefile.in @@ -424,7 +424,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_jpeg StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi Library_clew Library_gie 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 +fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi Library_clew Library_gie 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 endif # MAKE_RESTARTS diff --git a/Repository.mk b/Repository.mk index 6a39035a1eb7..aa8043fa0b2e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -104,6 +104,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \ $(call gb_Helper_optional,FUZZERS,pcdfuzzer) \ $(call gb_Helper_optional,FUZZERS,dxffuzzer) \ $(call gb_Helper_optional,FUZZERS,metfuzzer) \ + $(call gb_Helper_optional,FUZZERS,ppmfuzzer) \ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ soffice_bin \ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \ diff --git a/vcl/Executable_ppmfuzzer.mk b/vcl/Executable_ppmfuzzer.mk new file mode 100644 index 000000000000..07b87a29d4c0 --- /dev/null +++ b/vcl/Executable_ppmfuzzer.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,ppmfuzzer)) + +$(eval $(call gb_Executable_use_api,ppmfuzzer,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Executable_use_externals,ppmfuzzer,\ + $(fuzzer_externals) \ +)) + +$(eval $(call gb_Executable_set_include,ppmfuzzer,\ + $$(INCLUDE) \ + -I$(SRCDIR)/vcl/inc \ +)) + +$(eval $(call gb_Executable_use_libraries,ppmfuzzer,\ + $(fuzzer_libraries) \ +)) + +$(eval $(call gb_Executable_use_static_libraries,ppmfuzzer,\ + findsofficepath \ + ulingu \ + fuzzer \ +)) + +$(eval $(call gb_Executable_add_exception_objects,ppmfuzzer,\ + vcl/workben/ppmfuzzer \ +)) + +$(eval $(call gb_Executable_add_libs,ppmfuzzer,\ + -lFuzzingEngine \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 9eaa3243e90b..2c46a97e12c5 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -117,6 +117,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ Executable_pcdfuzzer \ Executable_dxffuzzer \ Executable_metfuzzer \ + Executable_ppmfuzzer \ )) endif diff --git a/vcl/workben/ppmfuzzer.cxx b/vcl/workben/ppmfuzzer.cxx new file mode 100644 index 000000000000..152f08dd438d --- /dev/null +++ b/vcl/workben/ppmfuzzer.cxx @@ -0,0 +1,24 @@ +/* -*- 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 +#include +#include "commonfuzzer.hxx" + +extern "C" bool ipbGraphicImport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem); + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + SvMemoryStream aStream(const_cast(data), size, StreamMode::READ); + Graphic aGraphic; + (void)ipbGraphicImport(aStream, aGraphic, nullptr); + return 0; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */