5 files changed, 97 insertions, 0 deletions
diff --git a/Repository.mk b/Repository.mk
index d8109be27577..1f8bb339c31f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
 	$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,dbffuzzer) \
 	$(call gb_Helper_optional,FUZZERS,webpfuzzer) \
+	$(call gb_Helper_optional,FUZZERS,zipfuzzer) \
 	soffice_bin \
     $(call gb_CondExeUnopkg, \
         unopkg_bin \
diff --git a/vcl/Executable_zipfuzzer.mk b/vcl/Executable_zipfuzzer.mk
new file mode 100644
index 000000000000..8b8b519db75b
--- /dev/null
+++ b/vcl/Executable_zipfuzzer.mk
@@ -0,0 +1,45 @@
+# -*- 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,zipfuzzer))
+
+$(eval $(call gb_Executable_use_api,zipfuzzer,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,zipfuzzer,\
+	$(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,zipfuzzer,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,zipfuzzer,\
+    $(fuzzer_core_libraries) \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,zipfuzzer,\
+    $(fuzzer_statics) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,zipfuzzer,\
+    vcl/workben/zipfuzzer \
+))
+
+$(eval $(call gb_Executable_add_libs,zipfuzzer,\
+    $(LIB_FUZZING_ENGINE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 0efce1960112..a98872853e41 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -192,6 +192,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
     Executable_sftfuzzer \
     Executable_dbffuzzer \
     Executable_webpfuzzer \
+    Executable_zipfuzzer \
 ))
 endif
 
diff --git a/vcl/workben/zipfuzzer.cxx b/vcl/workben/zipfuzzer.cxx
new file mode 100644
index 000000000000..9474c2df2cc8
--- /dev/null
+++ b/vcl/workben/zipfuzzer.cxx
@@ -0,0 +1,48 @@
+/* -*- 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 "commonfuzzer.hxx"
+
+#include <config_features.h>
+#include <com/sun/star/io/WrongFormatException.hpp>
+#include <osl/detail/component-mapping.h>
+
+extern "C" bool TestImportZip(SvStream& rStream);
+
+const lib_to_factory_mapping* lo_get_factory_map(void)
+{
+    static lib_to_factory_mapping map[] = { { 0, 0 } };
+
+    return map;
+}
+
+const lib_to_constructor_mapping* lo_get_constructor_map(void)
+{
+    static lib_to_constructor_mapping map[] = { { 0, 0 } };
+
+    return map;
+}
+
+extern "C" void* lo_get_custom_widget_func(const char*) { return nullptr; }
+
+extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv)
+{
+    TypicalFuzzerInitialize(argc, argv);
+    return 0;
+}
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+    SvMemoryStream aStream(const_cast<uint8_t*>(data), size, StreamMode::READ);
+    (void)TestImportZip(aStream);
+    return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/workben/zipfuzzer.options b/vcl/workben/zipfuzzer.options
new file mode 100644
index 000000000000..f09db1b41438
--- /dev/null
+++ b/vcl/workben/zipfuzzer.options
@@ -0,0 +1,2 @@
+[libfuzzer]
+max_len = 32000