[Libreoffice-commits] core.git: 3 commits - connectivity/Library_dbtools.mk connectivity/source Makefile.in Repository.mk svtools/source vcl/Executable_svmfuzzer.mk vcl/Module_vcl.mk vcl/workben
Caolán McNamara
caolanm at redhat.com
Mon Jan 9 11:52:36 UTC 2017
Makefile.in | 2 -
Repository.mk | 1
connectivity/Library_dbtools.mk | 2 -
connectivity/source/parse/sqlflex.l | 2 +
svtools/source/contnr/treelistbox.cxx | 2 -
vcl/Executable_svmfuzzer.mk | 47 ++++++++++++++++++++++++++++++++++
vcl/Module_vcl.mk | 1
vcl/workben/svmfuzzer.cxx | 22 +++++++++++++++
8 files changed, 75 insertions(+), 4 deletions(-)
New commits:
commit 9a30cb2161506e003f14592d83075ab9d30516c1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 9 10:38:28 2017 +0000
hack to silence -Wunused-function
Change-Id: I585839c05ca3b0336ffbe2c60a2f58c34b0aae78
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 57127b7..8fc596b 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -67,8 +67,6 @@ connectivity/source/parse/sqlflex \
$(call gb_LexTarget_get_scanner_target,connectivity/source/parse/sqlflex) : T_LEXFLAGS := -i -8 -PSQLyy -L
-
-
$(eval $(call gb_Library_add_exception_objects,dbtools,\
connectivity/source/commontools/AutoRetrievingBase \
connectivity/source/commontools/BlobHelper \
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 84edfd9..5e80f2a 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -87,6 +87,8 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = nullptr;
#define YY_FATAL_ERROR(msg) \
{ \
xxx_pGLOBAL_SQLSCAN->SQLyyerror(msg); \
+ /*hack to silence -Wunused-function*/ \
+ if (0) yy_fatal_error(msg); \
}
%}
commit 1f8ee857dcd5f6591d060746c805fdcc036a112b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 9 10:23:11 2017 +0000
non debug warning -Wmaybe-uninitialized
Change-Id: I16c04585ee2c411ae362230590a06bdc9e22443d
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 215661b..b359859 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2905,7 +2905,7 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
rRenderContext.SetFont(aBackupFont);
}
- sal_uInt16 nFirstDynTabPos;
+ sal_uInt16 nFirstDynTabPos(0);
SvLBoxTab* pFirstDynamicTab = GetFirstDynamicTab(nFirstDynTabPos);
long nDynTabPos = GetTabPos(&rEntry, pFirstDynamicTab);
nDynTabPos += pImpl->nNodeBmpTabDistance;
commit 1f5a2f7a915375667ac390f80858eefcff799887
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 9 10:06:07 2017 +0000
add svm fuzzer
Change-Id: I56606605e7ce7e282960432384057f2986d3a187
diff --git a/Makefile.in b/Makefile.in
index 1469e4d..6aa00d0 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
+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
endif # MAKE_RESTARTS
diff --git a/Repository.mk b/Repository.mk
index ff4876e..560716d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,xpmfuzzer) \
$(call gb_Helper_optional,FUZZERS,pngfuzzer) \
$(call gb_Helper_optional,FUZZERS,bmpfuzzer) \
+ $(call gb_Helper_optional,FUZZERS,svmfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_svmfuzzer.mk b/vcl/Executable_svmfuzzer.mk
new file mode 100644
index 0000000..d9a009c
--- /dev/null
+++ b/vcl/Executable_svmfuzzer.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,svmfuzzer))
+
+$(eval $(call gb_Executable_use_api,svmfuzzer,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,svmfuzzer,\
+ $(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,svmfuzzer,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,svmfuzzer,\
+ $(fuzzer_libraries) \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,svmfuzzer,\
+ findsofficepath \
+ ulingu \
+ fuzzer \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,svmfuzzer,\
+ vcl/workben/svmfuzzer \
+))
+
+$(eval $(call gb_Executable_add_libs,svmfuzzer,\
+ -lFuzzingEngine \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index b873823..571c046 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -113,6 +113,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Executable_xpmfuzzer \
Executable_pngfuzzer \
Executable_bmpfuzzer \
+ Executable_svmfuzzer \
))
endif
diff --git a/vcl/workben/svmfuzzer.cxx b/vcl/workben/svmfuzzer.cxx
new file mode 100644
index 0000000..2c98fda
--- /dev/null
+++ b/vcl/workben/svmfuzzer.cxx
@@ -0,0 +1,22 @@
+/* -*- 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/gdimtf.hxx>
+#include "commonfuzzer.hxx"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+ SvMemoryStream aStream(const_cast<uint8_t*>(data), size, StreamMode::READ);
+ GDIMetaFile aGDIMetaFile;
+ ReadGDIMetaFile(aStream, aGDIMetaFile);
+ return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list