6 files changed, 66 insertions, 11 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 224784a18..85fa8f1dd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -80,17 +80,22 @@ file(COPY
   data/signed_monero_tx
   DESTINATION data)
 
-add_subdirectory(core_tests)
-add_subdirectory(fuzz)
-add_subdirectory(crypto)
-add_subdirectory(functional_tests)
-add_subdirectory(performance_tests)
-add_subdirectory(core_proxy)
-add_subdirectory(unit_tests)
-add_subdirectory(difficulty)
-add_subdirectory(block_weight)
-add_subdirectory(hash)
-add_subdirectory(net_load_tests)
+if (CMAKE_BUILD_TYPE STREQUAL "fuzz" OR OSSFUZZ)
+  add_subdirectory(fuzz)
+else ()
+  add_subdirectory(core_tests)
+  add_subdirectory(fuzz)
+  add_subdirectory(crypto)
+  add_subdirectory(functional_tests)
+  add_subdirectory(performance_tests)
+  add_subdirectory(core_proxy)
+  add_subdirectory(unit_tests)
+  add_subdirectory(difficulty)
+  add_subdirectory(block_weight)
+  add_subdirectory(hash)
+  add_subdirectory(net_load_tests)
+endif()
+
 if (BUILD_GUI_DEPS)
   add_subdirectory(libwallet_api_tests)
 endif()
diff --git a/tests/data/fuzz/utf8/UTF8_1 b/tests/data/fuzz/utf8/UTF8_1
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/data/fuzz/utf8/UTF8_1
diff --git a/tests/data/fuzz/utf8/UTF8_2 b/tests/data/fuzz/utf8/UTF8_2
new file mode 100644
index 000000000..bb6982c4f
--- /dev/null
+++ b/tests/data/fuzz/utf8/UTF8_2
diff --git a/tests/fuzz/CMakeLists.txt b/tests/fuzz/CMakeLists.txt
index a599f86f8..0cf1740ad 100644
--- a/tests/fuzz/CMakeLists.txt
+++ b/tests/fuzz/CMakeLists.txt
@@ -218,3 +218,13 @@ set_property(TARGET tx-extra_fuzz_tests
   PROPERTY
     FOLDER "tests")
 
+monero_add_minimal_executable(utf8_fuzz_tests utf8.cpp fuzzer.cpp)
+target_link_libraries(utf8_fuzz_tests
+  PRIVATE
+    common
+    epee
+    ${Boost_THREAD_LIBRARY}
+    ${Boost_CHRONO_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTRA_LIBRARIES}
+    $ENV{LIB_FUZZING_ENGINE})
diff --git a/tests/fuzz/utf8.cpp b/tests/fuzz/utf8.cpp
new file mode 100644
index 000000000..bf304a351
--- /dev/null
+++ b/tests/fuzz/utf8.cpp
@@ -0,0 +1,39 @@
+// Copyright (c) 2017-2020, The Monero Project
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+// 
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+// 
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+// 
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "include_base_utils.h"
+#include "file_io_utils.h"
+#include "common/utf8.h"
+#include "fuzzer.h"
+
+BEGIN_INIT_SIMPLE_FUZZER()
+END_INIT_SIMPLE_FUZZER()
+
+BEGIN_SIMPLE_FUZZER()
+  tools::utf8canonical(std::string((const char*)buf, len), [](wint_t c)->wint_t { return c; });
+END_SIMPLE_FUZZER()
diff --git a/tests/unit_tests/epee_serialization.cpp b/tests/unit_tests/epee_serialization.cpp
index cade16f0d..95a2b6ecd 100644
--- a/tests/unit_tests/epee_serialization.cpp
+++ b/tests/unit_tests/epee_serialization.cpp
@@ -30,6 +30,7 @@
 #include <gtest/gtest.h>
 
 #include "storages/portable_storage.h"
+#include "span.h"
 
 TEST(epee_binary, two_keys)
 {