mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add hwp fuzzer

Browse Source 
Change-Id: I07fe351a182328f9ef98cb9866529637a6688c64
Reviewed-on: https://gerrit.libreoffice.org/34570
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-02-23 10:30:17 +00:00
parent 71a84b69ae
commit 40e55cf24d
7 changed files with 81 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -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_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 Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer
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 Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer
endif # MAKE_RESTARTS

1
Repository.mk
View File

@@ -112,6 +112,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,rasfuzzer) \
$(call gb_Helper_optional,FUZZERS,tgafuzzer) \
$(call gb_Helper_optional,FUZZERS,tiffuzzer) \
$(call gb_Helper_optional,FUZZERS,hwpfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \

5
hwpfilter/source/hwpreader.cxx
View File

@@ -116,16 +116,15 @@ HwpReader::~HwpReader()
{
}
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHWP(const OUString &rURL)
extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportHWP(SvStream &rStream)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
std::unique_ptr<HStream> stream(new HStream);
byte aData[32768];
std::size_t nRead, nBlock = 32768;
while (true)
{
nRead = aFileStream.ReadBytes(aData, nBlock);
nRead = rStream.ReadBytes(aData, nBlock);
if (nRead == 0)
break;
stream->addData(aData, (int)nRead);

48
vcl/Executable_hwpfuzzer.mk Normal file
View File

@@ -0,0 +1,48 @@
# -*- 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,hwpfuzzer))
$(eval $(call gb_Executable_use_api,hwpfuzzer,\
offapi \
udkapi \
))
$(eval $(call gb_Executable_use_externals,hwpfuzzer,\
$(fuzzer_externals) \
))
$(eval $(call gb_Executable_set_include,hwpfuzzer,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
))
$(eval $(call gb_Executable_use_libraries,hwpfuzzer,\
hwp \
$(fuzzer_libraries) \
))
$(eval $(call gb_Executable_use_static_libraries,hwpfuzzer,\
findsofficepath \
ulingu \
fuzzer \
))
$(eval $(call gb_Executable_add_exception_objects,hwpfuzzer,\
vcl/workben/hwpfuzzer \
))
$(eval $(call gb_Executable_add_libs,hwpfuzzer,\
-lFuzzingEngine \
))
# vim: set noet sw=4 ts=4:

1
vcl/Module_vcl.mk
View File

@@ -125,6 +125,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Executable_rasfuzzer \
Executable_tgafuzzer \
Executable_tiffuzzer \
Executable_hwpfuzzer \
))
endif

8
vcl/workben/fftester.cxx
View File

@@ -68,6 +68,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
typedef bool (*WFilterCall)(const OUString &rUrl, const OUString &rFlt);
typedef bool (*HFilterCall)(const OUString &rUrl);
typedef bool (*FFilterCall)(SvStream &rStream);
/* This constant specifies the number of inputs to process before restarting.
* This is optional, but helps limit the impact of memory leaks and similar
@@ -404,16 +405,17 @@ try_again:
}
else if (strcmp(argv[2], "hwp") == 0)
{
static HFilterCall pfnImport(nullptr);
static FFilterCall pfnImport(nullptr);
if (!pfnImport)
{
osl::Module aLibrary;
aLibrary.loadRelative(&thisModule, "libhwplo.so", SAL_LOADMODULE_LAZY);
pfnImport = reinterpret_cast<HFilterCall>(
pfnImport = reinterpret_cast<FFilterCall>(
aLibrary.getFunctionSymbol("TestImportHWP"));
aLibrary.release();
}
ret = (int) (*pfnImport)(out);
SvFileStream aFileStream(out, StreamMode::READ);
ret = (int) (*pfnImport)(aFileStream);
}
else if (strcmp(argv[2], "602") == 0)
{

23
vcl/workben/hwpfuzzer.cxx Normal file
View File

@@ -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 TestImportHWP(SvStream &rStream);
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
{
SvMemoryStream aStream(const_cast<uint8_t*>(data), size, StreamMode::READ);
(void)TestImportHWP(aStream);
return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */