Merge pull request #973 from redboltz/update_to_402

Updated the version to 4.0.2.

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2021-08-31 version 4.0.2 for C++
+  * Fix fuzzer interface function name (#972)
+  * Fix boost test link error and support both dynamin(default) and static link boost (#971)
+
 # 2021-08-30 version 4.0.1 for C++
   * Fix release tarball and its generation script (#967)
 

CMakeLists.txt

@@ -27,6 +27,8 @@ OPTION (MSGPACK_BUILD_TESTS     "Build tests"               OFF)
 OPTION (MSGPACK_FUZZ_REGRESSION  "Enable regression testing"            OFF)
 OPTION (MSGPACK_BUILD_EXAMPLES   "Build msgpack examples"               OFF)
 OPTION (MSGPACK_GEN_COVERAGE     "Generate coverage report"             OFF)
+OPTION (MSGPACK_USE_STATIC_BOOST "Statically link with boost libraries" OFF)
+OPTION (MSGPACK_CHAR_SIGN        "Char sign to use (signed or unsigned)")
 
 SET (CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -60,7 +62,14 @@ IF (MSGPACK_32BIT)
 ENDIF ()
 
 SET (Boost_USE_MULTITHREADED ON)
-SET (Boost_USE_STATIC_RUNTIME    OFF)
+
+IF (MSGPACK_USE_STATIC_BOOST)
+    MESSAGE (STATUS "Staticly linking with Boost")
+    SET (Boost_USE_STATIC_LIBS TRUE)
+ELSE ()
+    MESSAGE (STATUS "Dynamically linking with Boost")
+    SET (Boost_USE_STATIC_LIBS FALSE)
+ENDIF ()
 
 IF (MSGPACK_CHAR_SIGN)
     SET (CMAKE_CXX_FLAGS "-f${MSGPACK_CHAR_SIGN}-char ${CMAKE_CXX_FLAGS}")
@@ -69,6 +78,7 @@ ENDIF ()
 IF (MSGPACK_DEFAULT_API_VERSION)
     SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION} ${CMAKE_CXX_FLAGS}")
 ELSE ()
+    SET (MSGPACK_DEFAULT_API_VERSION 3)
     SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=3 ${CMAKE_CXX_FLAGS}")
 ENDIF ()
 

README.md

@@ -1,7 +1,7 @@
 `msgpack` for C++
 ===================
 
-Version 4.0.1 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
+Version 4.0.2 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
 [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master)
 
 It's like JSON but smaller and faster.
@@ -153,6 +153,8 @@ Other useful options:
 - `MSGPACK_32BIT` (default `OFF`): 32bit compile
 - `MSGPACK_USE_X3_PARSE` (default `OFF`): use Boost X3 parse
   (note that it requires C++14 or newer)
+- `MSGPACK_CHAR_SIGN` (not set explicitly by default): char sign to use (signed or unsigned)
+- `MSGPACK_USE_STATIC_BOOST` (default `OFF`): statically link with boost libraries
 
 #### GUI on Windows
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.0.1.{build}
+version: 4.0.2.{build}
 
 branches:
   only:

example/x3/CMakeLists.txt

@@ -1,5 +1,5 @@
 IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
-    FIND_PACKAGE (Boost REQUIRED COMPONENTS context system unit_test_framework)
+    FIND_PACKAGE (Boost REQUIRED COMPONENTS context system)
     FIND_PACKAGE (Threads REQUIRED)
 
     LIST (APPEND exec_PROGRAMS
@@ -43,7 +43,6 @@ IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
             msgpackc-cxx
             Boost::context
             Boost::system
-            Boost::unit_test_framework
             Threads::Threads
         )
         IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

fuzz/CMakeLists.txt

@@ -11,6 +11,10 @@ FOREACH (source_file ${check_PROGRAMS})
         ${source_file_we}
         ${source_file}
     )
+
+    TARGET_COMPILE_DEFINITIONS (${source_file_we} PRIVATE
+        $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>)
+
     TARGET_LINK_LIBRARIES (${source_file_we}
         msgpackc-cxx
         Threads::Threads
@@ -18,7 +22,9 @@ FOREACH (source_file ${check_PROGRAMS})
         Boost::system
         Boost::unit_test_framework
     )
+
     ADD_TEST (${source_file_we} ${source_file_we})
+
     IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
       SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -g")
         IF ("${MSGPACK_SAN}" STREQUAL "ASAN")

fuzz/regression_runner.cpp

@@ -38,7 +38,7 @@ void UnpackPackFuzzerRegressionTest(const std::string& fpath) {
   std::vector<char> bytes(length);
   in.read(bytes.data(), bytes.size());
   BOOST_REQUIRE(in);
-  BOOST_REQUIRE_EQUAL(0, FuzzerTestOneInput(reinterpret_cast<const uint8_t *>(bytes.data()), bytes.size()));
+  BOOST_REQUIRE_EQUAL(0, LLVMFuzzerTestOneInput(reinterpret_cast<const uint8_t *>(bytes.data()), bytes.size()));
 }
 
 boost::unit_test::test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])

fuzz/unpack_pack_fuzzer.cpp

@@ -1,6 +1,10 @@
 #include <msgpack.hpp>
 
-extern "C" int FuzzerTestOneInput(const uint8_t *data, size_t size) {
+// The function's signature must NOT be changed since other projects rely on it:
+// - libFuzzer
+// - AFL++
+// - Google's oss-fuzz (uses the previous two ones)
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   try {
     // NOTE(derwolfe): by default the limits are set at 2^32-1 length. I'm
     // setting these at far smaller values to avoid OOMs

include/msgpack/version_master.hpp

@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    4
 #define MSGPACK_VERSION_MINOR    0
-#define MSGPACK_VERSION_REVISION 1
+#define MSGPACK_VERSION_REVISION 2

test/CMakeLists.txt

@@ -74,6 +74,9 @@ FOREACH (source_file ${check_PROGRAMS})
         ${source_file}
     )
 
+    TARGET_COMPILE_DEFINITIONS (${source_file_we} PRIVATE
+        $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>)
+
     TARGET_LINK_LIBRARIES (${source_file_we}
         msgpackc-cxx
         Boost::system
@@ -81,6 +84,7 @@ FOREACH (source_file ${check_PROGRAMS})
         Threads::Threads
         ZLIB::ZLIB
     )
+
     ADD_TEST (NAME ${source_file_we} COMMAND ${source_file_we})
 
     IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

test/fuzz_unpack_pack_fuzzer_cpp11.cpp

@@ -5,5 +5,5 @@
 
 BOOST_AUTO_TEST_CASE(works)
 {
-  BOOST_CHECK_EQUAL(0, FuzzerTestOneInput(MSGPACK_NULLPTR, 0));
+  BOOST_CHECK_EQUAL(0, LLVMFuzzerTestOneInput(MSGPACK_NULLPTR, 0));
 }